Changeset 3152 for trunk/gsdl/src/recpt/queryaction.cpp

Timestamp:

2002-06-17T15:46:09+12:00 (21 years ago)

Author:

jrm21

Message:

Don't set _quotedquery_ (used to display post-processing information) if we aren't using mg. Eg mgpp shouldn't display this.

File:

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

trunk/gsdl/src/recpt/queryaction.cpp

@@ -554 +554 @@
   // _thislast_
 
-
-  // 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);
+  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);
-
   
   define_query_interface(disp, args, protos, logout);
-
-  
-
-  
-
 
 }
@@ -995 +990 @@
 
 
+
   if (args["ccs"] == "1") {
     if (!args["cc"].empty()) {
@@ -1335 +1331 @@
 
   if (!formattedstring.empty()) { // do the query
+    // note! formattedstring is in unicode! mg and mgpp must convert!
     set_queryfilter_options (request, formattedstring, args);
     collectproto->filter (collection, request, response, err, logout);