Changeset 7380

Timestamp:

2004-05-24T15:33:18+12:00 (20 years ago)

Author:

mdewsnip

Message:

(Human Info) Made some parameters const, and added an extended addqueryelem function.

Location:

trunk/gsdl/src/recpt

Files:

• querytools.cpp (modified) (3 diffs)
• querytools.h (modified) (1 diff)

trunk/gsdl/src/recpt/querytools.cpp

@@ -391 +391 @@
 }
 
-text_t addstemcase(text_t &terms, text_t &stem, text_t &fold) {
+text_t addstemcase(const text_t &terms, const text_t &stem, const text_t &fold) {
   
   text_t outtext;
@@ -446 +446 @@
 
 
-
-void addqueryelem(text_t &querystring, text_t &tag, 
-                  text_t &query, text_t combine) {
+void addqueryelem(text_t &querystring, const text_t &tag, 
+          const text_t &query, const text_t combine) {
   if (!querystring.empty()) { // have to put and/or
     querystring += " "+combine + " ";
@@ -463 +462 @@
 
 
-void format_field_info(text_t & querystring, text_t &tag) {
+void addqueryelem_ex(text_t &querystring, const text_t &tag, 
+             const text_t &terms, const text_t &stem, const text_t &fold,
+             const text_t& combine, const text_t& word_combine) {
+  if (!querystring.empty()) { // have to put and/or
+    querystring += " " + combine + " ";
+  }
+  text_t outtext; outtext.reserve(512);
+  text_t word; word.reserve(100);
+  //unsigned short c;                                                            
+  text_t::const_iterator here = terms.begin();
+  text_t::const_iterator end = terms.end();
+  bool inquote = false, firstword = true;
+
+  text_t word2; word2.reserve(256);
+    
+  while (here !=end) {
+    if (is_unicode_space(*here)) {
+      if (word2 == "AND") { word2.clear(); word2.push_back(7527); word2.appendcarr("AND", 3); word2.push_back(7527); }
+      else if (word2 == "OR") { word2.clear(); word2.push_back(7527); word2.appendcarr("OR", 2); word2.push_back(7527); }
+      else if (word2 == "NOT") { word2.clear(); word2.push_back(7527); word2.appendcarr("NOT", 3); word2.push_back(7527); }
+      else if (word2 == "NEAR") { word2.clear(); word2.push_back(7527); word2.appendcarr("NEAR", 4); word2.push_back(7527); }
+      else if (word2 == "WITHIN") { word2.clear(); word2.push_back(7527); word2.appendcarr("WITHIN", 6); word2.push_back(7527); }
+      if (inquote) {
+    word2.push_back(*here);
+      }
+      word.append(word2); word2.clear();
+            
+      if (!inquote && !word.empty() ) {
+                // found word boundary   
+                
+    if (stem == "1" || fold =="1") {
+      word += "#";
+      if (stem == "1") word += "s";
+      //else word += "u";
+                    
+      if (fold == "1") word += "i";
+      //else word += "c";
+    }
+    if (firstword) {
+      firstword = false;
+    } else {
+      outtext += " " + word_combine + " ";
+    }
+    outtext += "[" + word + "]:"+tag;
+    word.clear();
+      }
+      ++here;
+    } else if (*here == '\"') {
+      word2.push_back(*here);
+      inquote = !inquote;
+      ++here;
+    } else {
+      // not word boundary
+      word2.push_back(*here);
+      ++here;    
+    }
+  }
+    
+  // get last word
+  if (!word2.empty()) {
+    if (word2 == "AND") { word2.clear(); word2.push_back(7527); word2.appendcarr("AND", 3); word2.push_back(7527); }
+    else if (word2 == "OR") { word2.clear(); word2.push_back(7527); word2.appendcarr("OR", 2); word2.push_back(7527); }
+    else if (word2 == "NOT") { word2.clear(); word2.push_back(7527); word2.appendcarr("NOT", 3); word2.push_back(7527); }
+    else if (word2 == "NEAR") { word2.clear(); word2.push_back(7527); word2.appendcarr("NEAR", 4); word2.push_back(7527); }
+    else if (word2 == "WITHIN") { word2.clear(); word2.push_back(7527); word2.appendcarr("WITHIN", 6); word2.push_back(7527); }
+    word.append(word2); word2.clear();
+        
+    if (stem == "1"|| fold == "1") {
+      word += "#";
+      if (stem == "1") word += "s";
+      //else word += "u";
+            
+      if (fold == "1") word += "i";
+      //else word += "c";
+    }
+    if (!outtext.empty()) outtext += " " + word_combine + " ";
+    outtext += "[" + word + "]:"+tag;
+  }
+  querystring += "(" + outtext + ")";
+}
+
+
+void format_field_info(text_t & querystring, const text_t &tag) {
 
   if (tag == "ZZ" || tag == "") {

trunk/gsdl/src/recpt/querytools.h

@@ -56 +56 @@
 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);
+void addqueryelem(text_t &querystring, const text_t &tag, 
+          const text_t &query, const text_t& combine);
+void addqueryelem_ex(text_t &querystring, const text_t &tag, 
+             const text_t &terms, const text_t &stem, const text_t &fold,
+             const text_t& combine, const text_t& word_combine);
+text_t addstemcase(const text_t &terms, const text_t &stem, const text_t &fold);
 text_t formatelem(text_t &text);
-void format_field_info(text_t &querystring, text_t &tag);
+void format_field_info(text_t &querystring, const text_t &tag);
+
 #endif
-
-
-
-