Changeset 20601

Timestamp:

2009-09-14T15:15:42+12:00 (15 years ago)

Author:

kjdon

Message:

use fqv instead of q arg to get the plain query terms when appropriate

File:

• gsdl/trunk/runtime-src/src/recpt/queryaction.cpp (modified) (1 diff)

gsdl/trunk/runtime-src/src/recpt/queryaction.cpp

@@ -812 +812 @@
 
     // add a queryterms macro for plain version of search terms
-    if (!args["q"].empty()) {
-      disp.setmacro ("queryterms", displayclass::defaultpackage, get_plain_query_terms(args["q"]));
-    }
+    if (!args["q"].empty()|| !args["fqv"].empty()) {
+      text_t query_arg = "";
+      if (args["qt"]=="0" && args["qto"] != "2") { // normal text search
+    query_arg = args["q"];
+      }
+      else if (args["qt"]=="1" || args["qto"]=="2"){ // form search
+
+    if (args["b"]=="1" && args["fqa"]=="1") { // explicit query
+      query_arg = args["q"];
+    }
+    else { // form search
+      query_arg = args["fqv"];
+    }
+      }
+      disp.setmacro ("queryterms", displayclass::defaultpackage, get_plain_query_terms(query_arg, args["ct"]));
+    }
+    
   }
 } // define external macros