Changeset 27362 for main/trunk/greenstone2/runtime-src/src

Timestamp:

2013-05-16T15:39:57+12:00 (11 years ago)

Author:

kjdon

Message:

slightly changed the handling of sortfield query option

File:

• main/trunk/greenstone2/runtime-src/src/recpt/queryaction.cpp (modified) (4 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/queryaction.cpp

@@ -558 +558 @@
     }
     set_option_macro ("fqf", args["fqf"], true, form_search, (*it).second, disp);
-    if (args["ct"] == "2") {// lucene
+      }
+      if (args["ct"] == "2") {// lucene
+    it = response.filterOptions.find("SortField");
       // set the sort field macro
       set_sfselection_macro(args["sf"], (*it).second, disp);
     }
       }
-    }
+  
 
     // add a queryterms macro for plain version of search terms
@@ -591 +593 @@
                        displayclass &disp) {
 
-  // we need at least one option here to continue
-  if (option.validValues.size() < 1) {
+  // we need at least two options here to continue
+  if (option.validValues.size() < 2) {
     return;
   }
@@ -600 +602 @@
   if (current_value.empty()) current_value = "";
   
-  // we give a rank option first
-  macrovalue += "<option value=\"\"";
-  if (current_value == "") {
-    macrovalue += " selected";
-  }
-  macrovalue += ">_query:textsortbyrank_\n";
-
   text_tarray::const_iterator thisvalue = option.validValues.begin();
   text_tarray::const_iterator endvalue = option.validValues.end();
-  int valid_count = 0;
+  //  int valid_count = 0;
   while (thisvalue != endvalue) {
-    if (*thisvalue != "ZZ" && *thisvalue != "TX") {
-      ++valid_count;
-      macrovalue += "<option value=\"by" + *thisvalue + "\"";
-      if (current_value == "by"+*thisvalue)
+    if (*thisvalue == "rank") {
+       macrovalue += "<option value=\"rank\"";
+       if (current_value == "rank") {
+     macrovalue += " selected";
+       }
+       macrovalue += ">_query:textsortbyrank_\n";
+    } else {
+      macrovalue += "<option value=\"" + *thisvalue + "\"";
+      if (current_value == *thisvalue)
     macrovalue += " selected";
       macrovalue += ">_" + *thisvalue + "_\n";
@@ -620 +620 @@
     ++thisvalue;
   }
-  macrovalue += "</select>";
-  if (valid_count > 0) {
-    disp.setmacro ("sfselection", displayclass::defaultpackage, macrovalue);
-  }
-  
-}
- 
+  macrovalue += "</select>";  
+  disp.setmacro ("sfselection", displayclass::defaultpackage, macrovalue);
+  
+}
+
 // sets the selection box macro _gformselection_.
 // the default for _gformselection_ is _gselection_