Changeset 6082

Timestamp:

2003-12-02T16:08:56+13:00 (20 years ago)

Author:

kjdon

Message:

added in NEAR to inside []

Location:

trunk

Files:

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

trunk/indexers/mgpp/text/GSDLQueryParser.cpp

@@ -217 +217 @@
 // expects starting brackets to have been parsed
 // sets error to true if something has gone wrong
-static void ParseSquareBrackets(UCArray::const_iterator &here,
+static ProxMatchQueryNode *ParseSquareBrackets(UCArray::const_iterator &here,
                 UCArray::const_iterator end,
-                ProxMatchQueryNode *proxNode,
+                /*ProxMatchQueryNode *proxNode,*/
                 int defaultStemMethod,
                 bool & error) {
 
+  ProxMatchQueryNode *proxNode = new ProxMatchQueryNode;
   LexEl el;
   bool phrase=false;
   bool first=true;
+  bool near = false;
+  UCArray near_string;
   while (ParseLexEl (here, end, el)) {
     if (el.lexType == TermE || el.lexType == IntegerE) {
@@ -237 +240 @@
           termNode.endRange = -1;
         }
-      }  
+      } else if (near) {
+    SetRangeValues(termNode, near_string);
+    near = false;
+      }
       proxNode->terms.push_back(termNode);
     }
@@ -245 +251 @@
     else if (el.lexType == QuoteE) {
       // phrase inside square brackets
-      if (phrase) phrase=false;
-      else phrase=true;
-    } else if (el.lexType == UnknownE) {
+      if (phrase) { // end of phrase
+    phrase=false;
+    first = true;
+      } else {
+    phrase=true; // start of phrase
+      }
+    } else if (el.lexType == NearOpE) {
+      if (phrase) {
+    // cant have NEAR op in a phrase - just assume its an actual word
+    TermNode termNode;
+    termNode.term = el.text;
+    ParseTermModifiers (here, end, termNode, defaultStemMethod);
+    proxNode->terms.push_back(termNode);
+      } else {
+    // its a NEAR op
+    near = true;
+    near_string = el.text;
+      }
+      
+    } 
+    else if (el.lexType == UnknownE) {
       // just ignore it 
     }
@@ -254 +278 @@
       cerr <<"GSDLQueryParser: bad syntax inside []\n";
       error = true;
-      return;
+      return NULL;
     }
   } // while
-
+  return proxNode;
 }
 // expects the starting quote to have been parsed
@@ -354 +378 @@
   else if (el.lexType == OpenSquareBracketE) {
     bool error = false;
-    ParseSquareBrackets (here, end, proxNode, defaultStemMethod, error);
+    proxNode = ParseSquareBrackets (here, end, /*proxNode, */defaultStemMethod, error);
     if (error) {
       delete proxNode;

trunk/mgpp/text/GSDLQueryParser.cpp

@@ -217 +217 @@
 // expects starting brackets to have been parsed
 // sets error to true if something has gone wrong
-static void ParseSquareBrackets(UCArray::const_iterator &here,
+static ProxMatchQueryNode *ParseSquareBrackets(UCArray::const_iterator &here,
                 UCArray::const_iterator end,
-                ProxMatchQueryNode *proxNode,
+                /*ProxMatchQueryNode *proxNode,*/
                 int defaultStemMethod,
                 bool & error) {
 
+  ProxMatchQueryNode *proxNode = new ProxMatchQueryNode;
   LexEl el;
   bool phrase=false;
   bool first=true;
+  bool near = false;
+  UCArray near_string;
   while (ParseLexEl (here, end, el)) {
     if (el.lexType == TermE || el.lexType == IntegerE) {
@@ -237 +240 @@
           termNode.endRange = -1;
         }
-      }  
+      } else if (near) {
+    SetRangeValues(termNode, near_string);
+    near = false;
+      }
       proxNode->terms.push_back(termNode);
     }
@@ -245 +251 @@
     else if (el.lexType == QuoteE) {
       // phrase inside square brackets
-      if (phrase) phrase=false;
-      else phrase=true;
-    } else if (el.lexType == UnknownE) {
+      if (phrase) { // end of phrase
+    phrase=false;
+    first = true;
+      } else {
+    phrase=true; // start of phrase
+      }
+    } else if (el.lexType == NearOpE) {
+      if (phrase) {
+    // cant have NEAR op in a phrase - just assume its an actual word
+    TermNode termNode;
+    termNode.term = el.text;
+    ParseTermModifiers (here, end, termNode, defaultStemMethod);
+    proxNode->terms.push_back(termNode);
+      } else {
+    // its a NEAR op
+    near = true;
+    near_string = el.text;
+      }
+      
+    } 
+    else if (el.lexType == UnknownE) {
       // just ignore it 
     }
@@ -254 +278 @@
       cerr <<"GSDLQueryParser: bad syntax inside []\n";
       error = true;
-      return;
+      return NULL;
     }
   } // while
-
+  return proxNode;
 }
 // expects the starting quote to have been parsed
@@ -354 +378 @@
   else if (el.lexType == OpenSquareBracketE) {
     bool error = false;
-    ParseSquareBrackets (here, end, proxNode, defaultStemMethod, error);
+    proxNode = ParseSquareBrackets (here, end, /*proxNode, */defaultStemMethod, error);
     if (error) {
       delete proxNode;