Changeset 20481

Timestamp:

2009-09-02T15:49:49+12:00 (14 years ago)

Author:

kjdon

Message:

added get_plain_query_terms method to querytools (only partially implemented so far), and use it in queryaction to clean up the q arg and save as _queryterms_ macro - used for PDF search parameter

Location:

gsdl/trunk/runtime-src/src/recpt

Files:

• queryaction.cpp (modified) (2 diffs)
• querytools.cpp (modified) (1 diff)
• querytools.h (modified) (1 diff)

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

@@ -809 +809 @@
     }
       }
+    }
+
+    // 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"]));
     }
   }
@@ -1650 +1655 @@
       // also reset the _cgiargq_ macro as it has changed now
       disp.setmacro("cgiargq", displayclass::defaultpackage, html_safe(args["q"]));
-      
+
       // reset the compressed options to include the q arg
       text_t compressedoptions = recpt->get_compressed_arg(args, logout);

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

@@ -332 +332 @@
 }
 
-
-    
+// turn query string into terms separated by spaces.
+// still working on this...
+text_t get_plain_query_terms(const text_t &querystring) {
+
+  text_t::const_iterator here = querystring.begin();
+  text_t::const_iterator end = querystring.end();
+  text_t terms = "";
+  bool space = false;
+  while (here != end) {
+    if (*here ==  '#' || *here == '/') {
+      // skip over #is /10 etc 
+      ++here;
+      while (here != end && *here != ' ') {
+    ++here;
+      }
+      if (here == end) break;
+    }
+    if (*here == '[') {
+      // get the text out and ignore the :TI after
+    }
+    if (is_unicode_letdig(*here)) {
+      terms.push_back(*here);
+      space = false;
+    } else {
+      if (!space) {
+    terms.push_back(' ');
+    space = true;
+      }
+    }
+    ++here;
+  }
+  return terms;
+    
+}
 
 // search history tool 

gsdl/trunk/runtime-src/src/recpt/querytools.h

@@ -48 +48 @@
            int startbc, int endbc, int ct);
 
+// get a plain version of the query string - terms, separated by space
+text_t get_plain_query_terms(const text_t &querystring);
+
 // search history tool
 text_t escape_quotes(const text_t &querystring);