Ticket #260: scriptindex.diff

scriptindex.cc

@@ -28 +28 @@
 #include <algorithm>
 #include <fstream>
 #include <iostream>
+#include <sstream>
 #include <list>
 #include <map>
 #include <string>
@@ -95 +96 @@
 const char * action_names[] = {
     "bad", "new",
     "boolean", "date", "field", "hash", "index", "indexnopos", "load", "lower",
-    "truncate", "unhtml", "unique", "value", "weight"
+    "numeric", "truncate", "unhtml", "unique", "value", "weight"
 };
 
 // For debugging:
@@ -106 +107 @@
     typedef enum {
         BAD, NEW,
         BOOLEAN, DATE, FIELD, HASH, INDEX, INDEXNOPOS, LOAD, LOWER,
-        TRUNCATE, UNHTML, UNIQUE, VALUE, WEIGHT
+        NUMERIC, TRUNCATE, UNHTML, UNIQUE, VALUE, WEIGHT
     } type;
 private:
     type action;
@@ -233 +234 @@
                             code = Action::LOAD;
                         }
                         break;
+                    case 'n':
+                        if (action == "numeric") {
+                            code = Action::NUMERIC;
+                            arg = YES;
+                            takes_integer_argument = true;
+                        }
+                        break;
                     case 't':
                         if (action == "truncate") {
                             code = Action::TRUNCATE;
@@ -591 +599 @@
                         if (!value.empty())
                             doc.add_value(i->get_num_arg(), value);
                         break;
+                    case Action::NUMERIC:
+                        if (!value.empty())
+                        {
+                                std::istringstream to_double(value);
+                                double          value_double;
+                                
+                                to_double >> value_double;
+                                
+                            doc.add_value(i->get_num_arg(), Xapian::sortable_serialise(value_double));
+                        }
+                        break;
                     case Action::DATE: {
                         const string & type = i->get_string_arg();
                         string yyyymmdd;