Changeset 1914

Timestamp:

2001-02-07T12:11:44+13:00 (23 years ago)

Author:

kjm18

Message:

new functions added for search history and form queries (mgpp)

Location:

trunk/gsdl/src/recpt

Files:

• querytools.cpp (modified) (2 diffs)
• querytools.h (modified) (2 diffs)

trunk/gsdl/src/recpt/querytools.cpp

@@ -26 +26 @@
 #include "querytools.h"
 #include <ctype.h>
+#include "unitool.h" // for is_unicode_letdig
 
 // request.filterResultOptions and request.fields (if required) should
@@ -288 +289 @@
   }
 }
+
+// search history tool
+text_t escape_quotes(const text_t &querystring) {
+
+  text_t::const_iterator here = querystring.begin();
+  text_t::const_iterator end = querystring.end();
+ 
+  text_t escquery = "";
+  while (here != end) {
+    if (*here != '\'' && *here != '\"') escquery.push_back(*here);
+    else {
+      escquery +="\\\\";
+      escquery.push_back(*here);
+    }
+
+    here++;
+  }
+  return escquery;
+
+}
+
+// some query form parsing functions for use with mgpp
+
+void parse_reg_query_form(text_t &querystring, cgiargsclass &args){
+
+  querystring.clear();
+  text_t combine;
+  int argt = args.getintarg("t");// t=0 -and, t=1 - or
+  if (argt == 0) combine = "&";
+  else combine = "|";
+  
+  text_t field = args["fqf"];
+  if (field.empty()) return; // no query
+  text_tarray fields;
+  splitchar(field.begin(), field.end(), ',', fields); 
+  
+  text_t value = args["fqv"];
+  if (value.empty()) return; // somethings wrong
+  text_tarray values;
+  splitchar(value.begin(), value.end(), ',', values);
+
+  for (int i=0; i< values.size(); i++) {
+    if (!values[i].empty()) {
+      text_t text = formatelem(values[i]);
+      addqueryelem(querystring, fields[i], values[i], combine);
+    }
+  }
+  
+}
+
+text_t formatelem(text_t &text) {
+
+  text_t::iterator here = text.begin();
+  text_t::iterator end = text.end();
+
+  bool space = false;
+  text_t newtext = "";
+  while (here != end) {
+    if (is_unicode_letdig(*here)) {
+      newtext.push_back(*here);
+      space = true;
+    }
+    else {
+      if (space) {
+    newtext.push_back(' ');
+    space = false;
+      }
+    }
+    here++;
+  }
+
+  return newtext;
+}
+
+void parse_adv_query_form(text_t &querystring, cgiargsclass &args){
+
+  querystring.clear();
+  text_t combine = "&";
+
+  text_t field = args["fqf"];
+  if (field.empty()) return; // no query
+  text_tarray fields;
+  splitchar(field.begin(), field.end(), ',', fields); 
+  
+  text_t value = args["fqv"];
+  if (value.empty()) return; // somethings wrong
+  text_tarray values;
+  splitchar(value.begin(), value.end(), ',', values);
+
+  text_t stem = args["fqs"];
+  if (stem.empty()) return; // somethings wrong
+  text_tarray stems;
+  splitchar(stem.begin(), stem.end(), ',', stems);
+
+  text_t fold = args["fqk"];
+  if (fold.empty()) return; // somethings wrong
+  text_tarray folds;
+  splitchar(fold.begin(), fold.end(), ',', folds);
+
+  text_t comb = args["fqc"];
+  if (comb.empty()) return; //somethings wrong
+  text_tarray combs;
+  splitchar(comb.begin(), comb.end(), ',', combs);
+  
+  for(int i=0; i< values.size(); i++) {
+    if (!values[i].empty()) {
+      if (i!=0) {
+    if (combs[i-1]=="and") combine = "&";
+    else if (combs[i-1]=="or")combine = "|";
+    else if (combs[i-1]=="not")combine = "!";
+      }
+      text_t term = values[i];
+      term = addstemcase(term, stems[i], folds[i]);
+      addqueryelem(querystring, fields[i], term, combine);
+    }
+    
+  }
+}
+
+text_t addstemcase(text_t &terms, text_t &stem, text_t &fold) {
+  
+  text_t outtext;
+  text_t word;
+  //unsigned short c;                                                            
+  text_t::iterator here = terms.begin();
+  text_t::iterator end = terms.end();
+
+  while (here !=end) {
+    if (is_unicode_letdig(*here)) {
+      // not word boundary
+      word.push_back(*here);
+      here++;    
+    }
+    else {
+      // found word boundary   
+      if (!word.empty() ) {
+    if (stem == "1" || fold =="1") {
+      word += "#";
+      if (stem == "1") word += "s";
+      //else word += "u";
+      
+      if (fold == "1") word += "i";
+      //else word += "c";
+    }
+    word += " ";
+    outtext += word;
+    word.clear();
+      }
+      //outtext.push_back(*here);
+      here++;
+    }
+  }
+   
+  // get last word
+  if (!word.empty()) {
+    if (stem == "1"|| fold == "1") {
+      word += "#";
+      if (stem == "1") word += "s";
+      //else word += "u";
+      
+      if (fold == "1") word += "i";
+      //else word += "c";
+    }
+    word += " ";
+    outtext += word;
+  }
+  return outtext;
+}
+
+
+
+void addqueryelem(text_t &querystring, text_t &tag, 
+                  text_t &query, text_t combine) {
+  if (!querystring.empty()) { // have to put and/or
+    querystring += " "+combine + " ";
+ 
+  }
+  if (tag=="ZZ") { // just add onto querystring
+       querystring +=  query;
+  }
+  else {
+    querystring += "["+query+"]:"+tag;
+  }
+
+}
+
+
+

trunk/gsdl/src/recpt/querytools.h

@@ -37 +37 @@
                   const text_t &querystring2, cgiargsclass &args);
 
-// don't hastle the function name ... it's been a long day ;)
+// don't hassle the function name ... it's been a long day ;)
 void set_more_queryfilter_options (FilterRequest_t &request, cgiargsclass &args);
 
@@ -49 +49 @@
 void add_ands(text_t& querystring, int querytype);
 
+// search history tool
+text_t escape_quotes(const text_t &querystring);
+
+// some query parsing functions for form processing (only for mgpp collections)
+void parse_reg_query_form(text_t &formattedstring, cgiargsclass &args);
+void parse_adv_query_form(text_t &formattedstring, cgiargsclass &args);
+
+void addqueryelem(text_t &querystring, text_t &tag, 
+          text_t &query, text_t combine);
+text_t addstemcase(text_t &terms, text_t &stem, text_t &fold);
+text_t formatelem(text_t &text);
+
 #endif