Changeset 4937 for trunk/gsdl/src

Timestamp:

2003-07-16T10:38:02+12:00 (21 years ago)

Author:

kjdon

Message:

fixed a bug I think I introduced - had put in onChange-updateXX(); into the option macros, but the javascript stuf should only be there for form searching. so added a new arg to the set_option_macro method

Location:

trunk/gsdl/src/recpt

Files:

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

trunk/gsdl/src/recpt/queryaction.cpp

@@ -633 +633 @@
 
 // sets the selection box macros _hselection_, _jselection_, _nselection_ _gselection_, fqfselection_ 
-void queryaction::set_option_macro (const text_t &macroname, text_t current_value, bool display_single,
+void queryaction::set_option_macro (const text_t &macroname, text_t current_value, bool display_single, bool add_js_update,
                     const FilterOption_t &option, displayclass &disp) {
   
@@ -645 +645 @@
   if (option.validValues.size() < 2) return;
   
-  text_t macrovalue = "<select name=\"" + macroname + "\" onChange=\"update"+macroname+"();\">\n";
+  text_t macrovalue = "<select name=\"" + macroname + "\"";
+  if (add_js_update) {
+    macrovalue += " onChange=\"update"+macroname+"();\"";
+  }
+  macrovalue += ">\n";
   
   if (current_value.empty()) current_value = option.defaultValue;
@@ -695 +699 @@
     // _hselection_ and _h2selection_ (Index)
     it = response.filterOptions.find ("Index");
-    if (it != end) set_option_macro ("h", args["h"], true, (*it).second, disp);
-    if (it != end) set_option_macro ("h2", args["h2"], true,(*it).second, disp);
+    if (it != end) set_option_macro ("h", args["h"], true, false, (*it).second, disp);
+    if (it != end) set_option_macro ("h2", args["h2"], true,false, (*it).second, disp);
     
     // _jselection_ and _j2selection_ (Subcollection)
     it = response.filterOptions.find ("Subcollection");
-    if (it != end) set_option_macro ("j", args["j"], true,(*it).second, disp);
-    if (it != end) set_option_macro ("j2", args["j2"], true,(*it).second, disp);
+    if (it != end) set_option_macro ("j", args["j"], true,false, (*it).second, disp);
+    if (it != end) set_option_macro ("j2", args["j2"], true,false, (*it).second, disp);
     
     // _nselection_ and _n2selection_ (Language)
     it = response.filterOptions.find ("Language");
-    if (it != end) set_option_macro ("n", args["n"], true,(*it).second, disp);
-    if (it != end) set_option_macro ("n2", args["n2"], true,(*it).second, disp);
+    if (it != end) set_option_macro ("n", args["n"], true,false, (*it).second, disp);
+    if (it != end) set_option_macro ("n2", args["n2"], true,false, (*it).second, disp);
 
     // _cq2selection_ (CombineQuery)
     it = response.filterOptions.find ("CombineQuery");
-    if (it != end) set_option_macro ("cq2", args["cq2"], true,(*it).second, disp);
+    if (it != end) set_option_macro ("cq2", args["cq2"], true,false, (*it).second, disp);
 
     if (args["ct"] == "1") { // mgpp collections
@@ -716 +720 @@
       it = response.filterOptions.find("Level");
       if (it!=end) {
-    set_option_macro("g", args["g"], false, (*it).second, disp);
+    set_option_macro("g", args["g"], false, false, (*it).second, disp);
     if (args["qt"]=="1") { // form search
       set_gformselection_macro(args["g"], (*it).second, disp);
@@ -723 +727 @@
       // _fqfselection_ field list
       it = response.filterOptions.find("IndexField");
-      if (it!=end) set_option_macro ("fqf", args["fqf"], true, (*it).second, disp);
+      if (it!=end) {
+    if (args["qt"]=="1") { // form search
+      set_option_macro ("fqf", args["fqf"], true, true, (*it).second, disp);
+    } else {
+      set_option_macro ("fqf", args["fqf"], true, false, (*it).second, disp);
+    }
+      }
     }
   }

trunk/gsdl/src/recpt/queryaction.h

@@ -85 +85 @@
 
   virtual void set_option_macro (const text_t &macroname, text_t current_value,
-                 bool display_single,
+                 bool display_single, bool add_js_update,
              const FilterOption_t &option, displayclass &disp);