Changeset 27361 for main/trunk

Timestamp:

2013-05-16T15:38:21+12:00 (11 years ago)

Author:

kjdon

Message:

new handling of sortfield query param

Location:

main/trunk/greenstone2/runtime-src/src/colservr

Files:

• lucenequeryfilter.cpp (modified) (2 diffs)
• lucenesearch.cpp (modified) (1 diff)

main/trunk/greenstone2/runtime-src/src/colservr/lucenequeryfilter.cpp

@@ -80 +80 @@
     ((lucenesearchclass *)textsearchptr)->set_text_level(cfgline[0]);
   }
+  
+  else if (key == "indexsortfields") {
+  filterOptions["SortField"].validValues.erase(filterOptions["SortField"].validValues.begin(), filterOptions["SortField"].validValues.end());
+    text_tarray::const_iterator here = cfgline.begin();
+    text_tarray::const_iterator end = cfgline.end();
+    while (here != end) {
+      if (!(*here).empty()) {
+    filterOptions["SortField"].validValues.push_back(*here);
+      }
+      ++here;
+    }
+  }
 }
 
@@ -88 +100 @@
   }
   
-  text_tarray field_array;
-  indexfieldmap.gettoarray(field_array);
-  for (int i=0; i<field_array.size(); i++) {
-    text_t field = field_array[i];
-    if (field!="ZZ" && field !="ZZ") {
-      filterOptions["SortField"].validValues.push_back("by"+field);
-    }
-  }
-  return true;
+  if (filterOptions["SortField"].defaultValue.empty() && filterOptions["SortField"].validValues.begin() != filterOptions["SortField"].validValues.end() && !filterOptions["SortField"].validValues[0].empty()) {
+      filterOptions["SortField"].defaultValue = filterOptions["SortField"].validValues[0];
+  }
+
+   return true;
 }
 

main/trunk/greenstone2/runtime-src/src/colservr/lucenesearch.cpp

@@ -123 +123 @@
     cmd += " -filter \"" + queryparams.filterstring + "\"";
   }
-  if (!queryparams.sortfield.empty()) {
+  if (!queryparams.sortfield.empty() && queryparams.sortfield != "rank") {
     cmd += " -sort \"" + queryparams.sortfield + "\"";
   }