Changeset 28841 for main/trunk/greenstone2/runtime-src/src/recpt/queryaction.cpp

Timestamp:

2014-02-21T18:46:01+13:00 (10 years ago)

Author:

ak19

Message:

Fixing up URL encoding of cgi args so that phrase searching works again. Tested MGPP, Lucene and SQLite searching. Tested simple search, fielded search, advanced single field and multi-field as well as running a query.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/queryaction.cpp (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/queryaction.cpp

@@ -1342 +1342 @@
     formattedstring = args["q"];
     // remove & | ! for simple search,do segmentation if necessary
+    // To url-decode the '&', format_querystring() will call unsafe_cgi_arg() first
     format_querystring (formattedstring, args.getintarg("b"), segment);
     if (args["ct"]!=0) { // mgpp and lucene - need to add in tag info if appropriate
@@ -1358 +1359 @@
     if (args["b"]=="1" && args["fqa"]=="1") { // explicit query
       formattedstring = args["q"];
+
+      // Replace %22 and %26 with " and & respectively, since these characters have meaning 
+      // in queries: " are used in phrases and & is used in boolean advanced searches.
+      // For form searches below, unsafe_cgi_arg is called in the parse_..._form() functions
+
+      unsafe_cgi_arg("ALL", formattedstring);
     }
     else { // form search
       if (args["b"]=="0") { // regular form
-    parse_reg_query_form(formattedstring, args, segment);
+    parse_reg_query_form(formattedstring, args, segment); // will call unsafe_cgi_arg to decode url encoding
       }
       else  { // advanced form
-    parse_adv_query_form(formattedstring, args, segment);
+    parse_adv_query_form(formattedstring, args, segment); // will call unsafe_cgi_arg to decode url encoding
       }
       args["q"] = formattedstring;