Changeset 7197 for trunk

Timestamp:

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

Author:

kjdon

Message:

made a couple of mods so that keiko's japanese segmentation will work, and show up as a phrase search

File:

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

trunk/gsdl/src/recpt/queryaction.cpp

@@ -551 +551 @@
   // define_internal_macros sets the following macros:
 
-  // _quotedquery_  the part of the query string that was quoted for post-processing
-
-
-
   // The following macros are set later (in define_query_macros) as they can't be set until 
   // the query has been done.
-
+  // _quotedquery_   the part of the query string that was quoted for post-processing
   // _freqmsg_      the term frequency string
 
@@ -568 +564 @@
   // _thisfirst_
   // _thislast_
-
-  if (args["ct"]==0) { // mg queries only, not mgpp
-    // get the quoted bits of the query string and set _quotedquery_
-    text_tarray phrases;
-    get_phrases (args["q"], phrases);
-    num_phrases = phrases.size();
-    text_tarray::const_iterator phere = phrases.begin();
-    text_tarray::const_iterator pend = phrases.end();
-    bool first = true;
-    text_t quotedquery;
-    while (phere != pend) {
-      if (!first)
-    if ((phere +1) == pend) quotedquery += " and ";
-    else quotedquery += ", ";
-      
-      quotedquery += "\"" + *phere + "\"";
-      first = false;
-      phere ++;
-    }
-    if (args.getintarg("s") && !quotedquery.empty()) quotedquery += "_textstemon_";
-    disp.setmacro ("quotedquery", "query", quotedquery);
-  }
 
   define_form_macros(disp, args, protos, logout);
@@ -1374 +1348 @@
   if (args["qt"]=="0" && args["qto"] != "2") { // normal text search
     formattedstring = args["q"];
-    // remove & | ! for simple search, insert spaces for chinese
+    // remove & | ! for simple search,do segmentation if necessary
     format_querystring (formattedstring, args.getintarg("b"), segment);
     if (args["ct"]=="1") { // mgpp - we need to add in the field info
@@ -1394 +1368 @@
     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"]));
-
-      // 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 {
+    }
+  } 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));
   }
 }
@@ -1473 +1448 @@
     disp.setmacro ("nextlast", "query", nextlast);
   }
+
+  // do quoted query here cos we may have added quotes during query pre-processing
+  if (args["ct"]==0) { // mg queries only, not mgpp
+    // get the quoted bits of the query string and set _quotedquery_
+    text_tarray phrases;
+    get_phrases (args["q"], phrases);
+    num_phrases = phrases.size();
+    text_tarray::const_iterator phere = phrases.begin();
+    text_tarray::const_iterator pend = phrases.end();
+    bool first = true;
+    text_t quotedquery;
+    while (phere != pend) {
+      if (!first)
+    if ((phere +1) == pend) quotedquery += " and ";
+    else quotedquery += ", ";
+      
+      quotedquery += "\"" + *phere + "\"";
+      first = false;
+      phere ++;
+    }
+    if (args.getintarg("s") && !quotedquery.empty()) quotedquery += "_textstemon_";
+    disp.setmacro ("quotedquery", "query", quotedquery);
+  }
+
 }