Changeset 4780 for trunk/gsdl/src/recpt

Timestamp:

2003-06-24T13:59:16+12:00 (21 years ago)

Author:

kjdon

Message:

have a new level selection macro, gformselection, which is used only in form search forms, in place of gselection. gformselection defaults to gselection. if paragraph level is defined, this is not used for form searching, so its removed from the selection. if there is no paragraph level, the default is used - gselection.

Location:

trunk/gsdl/src/recpt

Files:

• queryaction.cpp (modified) (1 diff)
• queryaction.h (modified) (1 diff)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -712 +712 @@
     if (it != end) set_option_macro ("cq2", args["cq2"], true,(*it).second, disp);
 
-    // _gselection_ (Level) // for mgpp collections
-    it = response.filterOptions.find("Level");
-    if (it!=end) set_option_macro("g", args["g"], false, (*it).second, disp);
-
-    // _fqfselection_ field list, for mgpp collections
-    it = response.filterOptions.find("IndexField");
-    if (it!=end) set_option_macro ("fqf", args["fqf"], true, (*it).second, disp);
+    if (args["ct"] == "1") { // mgpp collections
+      // _gselection_ (Level) 
+      it = response.filterOptions.find("Level");
+      if (it!=end) {
+    set_option_macro("g", args["g"], false, (*it).second, disp);
+    if (args["qt"]=="1") { // form search
+      set_gformselection_macro(args["g"], (*it).second, disp);
+    }
+      }
+      // _fqfselection_ field list
+      it = response.filterOptions.find("IndexField");
+      if (it!=end) set_option_macro ("fqf", args["fqf"], true, (*it).second, disp);
+    }
+  }
+} // define external macros
     
-  }
-} // define external macros
-
+// sets the selection box macro _gformselection_.
+// the default for _gformselection_ is _gselection_
+void queryaction::set_gformselection_macro (text_t current_value,
+                    const FilterOption_t &option,
+                    displayclass &disp) {
+  
+  if (option.validValues.size() <= 1) {
+    return;
+  }
+  // we need to check to see if there is paragraph present
+  text_tarray::const_iterator thisvalue = option.validValues.begin();
+  text_tarray::const_iterator endvalue = option.validValues.end();
+
+  bool has_paras = false;
+  while (thisvalue != endvalue) {
+    if (*thisvalue == "Paragraph") {
+      has_paras = true;
+      break;
+    }
+    thisvalue++;
+  }
+  if (!has_paras) return; // there is no difference between the form selection and the normal one
+
+  if (option.validValues.size() == 2) {
+    // we will only have one value, but we will still put it in as a text string
+    int opt = 0;
+    if (option.validValues[0] == "Paragraph") {
+      opt = 1;
+    }
+    disp.setmacro ("gformselection", "Global", "_"+option.validValues[opt]+"_");
+    return;
+  }
+
+  // there will be a select box
+  text_t macrovalue = "<select name=\"g\">\n";
+
+  if (current_value.empty()) current_value = option.defaultValue;
+  
+  thisvalue = option.validValues.begin();
+  
+  while (thisvalue != endvalue) {
+    if (*thisvalue != "Paragraph") {
+      macrovalue += "<option value=\"" + *thisvalue + "\"";
+      if (*thisvalue == current_value)
+    macrovalue += " selected";
+      macrovalue += ">_" + *thisvalue + "_\n";
+    }
+    thisvalue ++;
+  }
+  macrovalue += "</select>\n";
+  disp.setmacro ("gformselection", "Global", macrovalue);
+}
 void queryaction::define_form_macros (displayclass &disp, cgiargsclass &args, 
                recptprotolistclass *protos, ostream &logout) {

trunk/gsdl/src/recpt/queryaction.h

@@ -88 +88 @@
              const FilterOption_t &option, displayclass &disp);
 
+  void set_gformselection_macro (text_t current_value,
+                 const FilterOption_t &option,
+                 displayclass &disp);
+
   void output_ccp (cgiargsclass &args, recptprotolistclass *protos,
            displayclass &disp, outconvertclass &outconvert,