Changeset 8692 for trunk/indexers/mgpp/text/GSDLQueryParser.cpp

Timestamp:

2004-11-29T15:43:11+13:00 (19 years ago)

Author:

kjdon

Message:

Added the changes from Emanuel Dejanu (Simple Words) - mostly efficiency changes. For example, changing i++ to ++i, delete xxx to delete []xxx, some stuff to do with UCArrays...

File:

• trunk/indexers/mgpp/text/GSDLQueryParser.cpp (modified) (3 diffs)

trunk/indexers/mgpp/text/GSDLQueryParser.cpp

@@ -94 +94 @@
                 UCArray &nearby,
                 bool reverse) {
-  UCArray NEARBY; SetCStr(NEARBY, "NEAR");
-  UCArray WITHIN; SetCStr(WITHIN, "WITHIN");
+  UCArray NEARBY; SetCStr(NEARBY, "NEAR", 4);
+  UCArray WITHIN; SetCStr(WITHIN, "WITHIN", 6);
   
   if (nearby == NEARBY) { // no modifier
@@ -123 +123 @@
     while (here != end) {
       size = size*10 + (*here-'0');
-      here++;
+      ++here;
     }
     if (within) {
@@ -263 +263 @@
   UCArray near_string;
   while (ParseLexEl (here, end, el)) {
-    if (el.lexType == TermE || el.lexType == IntegerE) {
+    // cant have AND, OR, NOT in square brackets, so assume they are words
+    if (el.lexType == TermE || el.lexType == IntegerE || el.lexType == AndOpE || el.lexType == OrOpE || el.lexType == NotOpE) {
       TermNode termNode;
       termNode.term = el.text;