Changeset 3159

Timestamp:

2002-06-21T14:41:14+12:00 (21 years ago)

Author:

kjdon

Message:

in mgpp form query, field list now has a blank line after All Fields and
TextOnly (which may or may not be present), before the 'real' metadata.

File:

• trunk/gsdl/src/recpt/queryaction.cpp (modified) (7 diffs)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -343 +343 @@
   arg_ainfo.longname = "form query fields";
   arg_ainfo.multiplechar = true;
-  //arg_ainfo.multiplevalue = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "";
@@ -354 +353 @@
   arg_ainfo.longname = "form query values";
   arg_ainfo.multiplechar = true;
-  //arg_ainfo.multiplevalue = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "";
@@ -366 +364 @@
   arg_ainfo.longname = "form query stems";
   arg_ainfo.multiplechar = true;
-  //arg_ainfo.multiplevalue = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "";
@@ -378 +375 @@
   arg_ainfo.longname = "form query casefolds";
   arg_ainfo.multiplechar = true;
-  //arg_ainfo.multiplevalue = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "";
@@ -389 +385 @@
   arg_ainfo.longname = "form query combines";
   arg_ainfo.multiplechar = true;
-  //arg_ainfo.multiplevalue = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "";
@@ -662 +657 @@
     text_tarray::const_iterator endvalue = option.validValues.end();
     
+    /* All fields should come first, then there may be a TextOnly field.
+       put a blank entry after these two.
+    */
+    assert (*thisvalue == "ZZ"); // Compulsory All fields
+    macrovalue += "<option value=\"" + *thisvalue + "\">_";    
+    macrovalue += *thisvalue + "_\n";
+    thisvalue ++;
+    
+    if (*thisvalue == "TX") { // Optional TextOnly
+      macrovalue += "<option value=\"" + *thisvalue + "\">_";    
+      macrovalue += *thisvalue + "_\n";
+      thisvalue ++;
+    }
+    if (thisvalue != endvalue) {
+      // add the balnk line here 
+      macrovalue += "<option>---\n";
+    }
     while (thisvalue != endvalue) {
       macrovalue += "<option value=\"" + *thisvalue + "\">_";    
@@ -1310 +1322 @@
       args["q"] = formattedstring;
       
+      // reset the cgiargfqv macro - need to escape any quotes in it
+      disp.setmacro("cgiargfqv", "query", escape_quotes(args["fqv"]));
+
       // also reset the _cgiargq_ macro as it has changed now
       disp.setmacro("cgiargq", "Global", html_safe(args["q"]));