Changeset 7199

Timestamp:

2004-04-07T16:36:31+12:00 (20 years ago)

Author:

kjdon

Message:

put some stuff back from the previous commit that was not required

File:

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

trunk/gsdl/src/recpt/queryaction.cpp

@@ -1355 +1355 @@
     add_dates(formattedstring, args.getintarg("ds"), args.getintarg("de"),
           args.getintarg("dsbc"), args.getintarg("debc"));
+    args["q"] = formattedstring;
   }
   else if (args["qt"]=="1" || args["qto"]=="2"){ // form search
@@ -1368 +1369 @@
     parse_adv_query_form(formattedstring, args);
       }
+      args["q"] = formattedstring;
+      
       // reset the cgiargfqv macro - need to escape any quotes in it
       disp.setmacro("cgiargfqv", "query", escape_quotes(args["fqv"]));
-    }
-  } else {
+
+      // also reset the _cgiargq_ macro as it has changed now
+      disp.setmacro("cgiargq", "Global", html_safe(args["q"]));
+      
+      // reset the compressed options to include the q arg
+      text_t compressedoptions = recpt->get_compressed_arg(args, logout);
+      if (!compressedoptions.empty()) {
+    disp.setmacro ("compressedoptions", "Global", dm_safe(compressedoptions));
+    // need a decoded version of compressedoptions for use within forms
+    // as browsers encode values from forms before sending to server
+    // (e.g. %25 becomes %2525)
+    decode_cgi_arg (compressedoptions);
+    disp.setmacro ("decodedcompressedoptions", "Global", dm_safe(compressedoptions));
+      }
+    } // form search
+  } // args["qt"]=1
+  else {
     logout << "ERROR (query_action::get_formatted_query_string): querytype not defined\n";
-    return;
-  }
-  
-  // reset the query arg in case it has changed
-  args["q"] = formattedstring;
-  
-  // also reset the _cgiargq_ macro as it has changed now
-  disp.setmacro("cgiargq", "Global", html_safe(args["q"]));
-  
-  // reset the compressed options to include the q arg
-  text_t compressedoptions = recpt->get_compressed_arg(args, logout);
-  if (!compressedoptions.empty()) {
-    disp.setmacro ("compressedoptions", "Global", dm_safe(compressedoptions));
-    // need a decoded version of compressedoptions for use within forms
-    // as browsers encode values from forms before sending to server
-    // (e.g. %25 becomes %2525)
-    decode_cgi_arg (compressedoptions);
-    disp.setmacro ("decodedcompressedoptions", "Global", dm_safe(compressedoptions));
   }
 }