Ticket #235: xapian_omega_make_sortstuff_options.diff

omega.cc

@@ -68 +68 @@
 // percentage cut-off
 int threshold = 0;
 
-bool sort_numeric = false;
-Xapian::valueno sort_key = Xapian::BAD_VALUENO; // Don't sort.
-bool sort_ascending = true;
-bool sort_after = false;
 Xapian::Enquire::docid_order docid_order = Xapian::Enquire::ASCENDING;
 
 Xapian::valueno collapse_key = 0;
@@ -94 +90 @@
     // set default thousands and decimal separators: e.g. "16,729 hits" "1.4K"
     option["decimal"] = ".";
     option["thousand"] = ",";
-    
+    option["sort_numeric"] = "false";
+    option["sort_ascending"] = "true";
+    option["sort_after"] = "false";
+    option["sort_key"] = ""; // don't sort
+
     // set the default stemming language
     option["stemmer"] = DEFAULT_STEM_LANGUAGE;
 
@@ -317 +317 @@
         const string & v = val->second;
         if (v[0] == '#') {
             // FIXME not supported currently!
-            sort_numeric = true;
-            sort_key = atoi(v.c_str() + 1);
+            option["sort_numeric"] = "true";
+            option["sort_key"] = v.substr(1);
         } else {
-            sort_key = atoi(v.c_str());
+            option["sort_key"] = v;
         }
         val = cgi_params.find("SORTREVERSE");
         if (val != cgi_params.end()) {
-            sort_ascending = (atoi(val->second.c_str()) == 0);
+            if (atoi(val->second.c_str()) != 0)
+                option["sort_ascending"] = "false";
         }
         val = cgi_params.find("SORTAFTER");
         if (val != cgi_params.end()) {
-            sort_after = (atoi(val->second.c_str()) != 0);
+            if (atoi(val->second.c_str()) != 0)
+                option["sort_after"] = "true";
         }
         // Add the sorting related options to filters too.
-        filters += int_to_string(sort_key);
-        if (sort_after) {
-            if (sort_ascending) {
+        filters += option["sort_key"];
+        if (option["sort_after"] == "true") {
+            if (option["sort_ascending"] == "true") {
                 filters += 'F';
             } else {
                 filters += 'R';
             }
         } else {
-            if (!sort_ascending) {
+            if (option["sort_ascending"] == "false") {
                 filters += 'r';
             }
         }

omega.h

@@ -56 +56 @@
 
 extern int threshold;
 
-extern bool sort_numeric;
-extern Xapian::valueno sort_key;
-extern bool sort_ascending;
-extern bool sort_after;
 extern Xapian::Enquire::docid_order docid_order;
 
 extern Xapian::valueno collapse_key;

query.cc

@@ -375 +375 @@
 
     enquire->set_cutoff(threshold);
 
-    if (sort_key != Xapian::BAD_VALUENO) {
-        if (sort_after) {
-            enquire->set_sort_by_relevance_then_value(sort_key, sort_ascending);
+    if (! option["sort_key"].empty()) {
+        if (option["sort_after"] == "true") {
+            enquire->set_sort_by_relevance_then_value(string_to_int(option["sort_key"]), option["sort_ascending"]=="true");
         } else {
-            enquire->set_sort_by_value_then_relevance(sort_key, sort_ascending);
+            enquire->set_sort_by_value_then_relevance((string_to_int(option["sort_key"]), option["sort_ascending"]=="true");
         }
     }