Changeset 29087 for main/trunk

Timestamp:

2014-06-05T09:57:40+12:00 (10 years ago)

Author:

kjdon

Message:

sortfield option. will now display even when there is only one option. this allows user to choose ascending/descending for that one sortfield. add code to use _textsortbynone_ macro for 'none' option.

File:

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

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

@@ -604 +604 @@
                        displayclass &disp) {
 
-  // we need at least two options here to continue
-  if (option.validValues.size() < 2) {
+  // we need at one sort option here to continue
+  if (option.validValues.size() < 1) {
     return;
   }
-
+  if (option.validValues.size() == 1) {
+    // we don't need a drop down list, just the value
+    text_t value = option.defaultValue;
+    text_t macrovalue = "";
+    if (value == "rank") {
+      macrovalue = "_query:textsortbyrank_";
+    } else if (value == "none") {
+      return; // no sorting is the only option, so don't display anything
+    } else {
+      macrovalue = "_"+value+"_";
+    }
+    disp.setmacro ("sfselection", displayclass::defaultpackage, macrovalue);
+    return;
+  }
+  // if we have more than two options, make a drop down list
   text_t macrovalue = "<select name=\"sf\">\n";
   
@@ -618 +632 @@
   //  int valid_count = 0;
   while (thisvalue != endvalue) {
+    macrovalue += "<option value=\"" + *thisvalue + "\"";
+    if (current_value == *thisvalue)
+      macrovalue += " selected";
+    macrovalue += ">";
     if (*thisvalue == "rank") {
-       macrovalue += "<option value=\"rank\"";
-       if (current_value == "rank") {
-     macrovalue += " selected";
-       }
-       macrovalue += ">_query:textsortbyrank_\n";
+       macrovalue += "_query:textsortbyrank_";
+    } else if (*thisvalue == "none") {
+      macrovalue += "_query:textsortbynone_";
     } else {
-      macrovalue += "<option value=\"" + *thisvalue + "\"";
-      if (current_value == *thisvalue)
-    macrovalue += " selected";
-      macrovalue += ">_" + *thisvalue + "_\n";
-    }
+      macrovalue += "_" + *thisvalue + "_";
+    }
+    macrovalue += "</option>/n";
     ++thisvalue;
   }