Changeset 3161 for trunk/gsdl

Timestamp:

2002-06-21T14:45:03+12:00 (22 years ago)

Author:

kjdon

Message:

syntax now handles phrases insode a field search, and term modifiers(#is)
inside a phrase.

File:

• trunk/gsdl/src/mgpp/text/GSDLQueryParser.cpp (modified) (4 diffs)

trunk/gsdl/src/mgpp/text/GSDLQueryParser.cpp

@@ -223 +223 @@
 
   LexEl el;
+  bool phrase=false;
+  bool first=true;
   while (ParseLexEl (here, end, el)) {
     if (el.lexType == TermE || el.lexType == IntegerE) {
@@ -228 +230 @@
       termNode.term = el.text;
       ParseTermModifiers (here, end, termNode, defaultStemMethod);
+      if (phrase) {
+        if (first) first=false;
+        else {
+          termNode.startRange = -2;
+          termNode.endRange = -1;
+        }
+      }  
       proxNode->terms.push_back(termNode);
     }
@@ -239 +248 @@
     else if (el.lexType == OrOpE) {
       cerr << "or inside []\n";
+    }
+    else if (el.lexType == QuoteE) {
+      // phrase inside square brackets
+      if (phrase) phrase=false;
+      else phrase=true;
     }
     else {
@@ -262 +276 @@
       TermNode termNode;
       termNode.term = el.text;
-      termNode.stemMethod = defaultStemMethod;
-      //ParseTermModifiers (here, end, termNode, defaultStemMethod);
+      //termNode.stemMethod = defaultStemMethod;
+      ParseTermModifiers (here, end, termNode, defaultStemMethod);
       if (first) {
     first = false;