Changeset 1770 for trunk/gsdl/src/mgpp/text/GSDLQueryParser.cpp

Timestamp:

2000-12-08T11:36:32+13:00 (23 years ago)

Author:

kjm18

Message:

changed parseQuery to take a new parameter - defaultBoolCombine - this
determines if terms are AND'd or OR'd together by default if operators
aren't explicitly stated

File:

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

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

@@ -28 +28 @@
 static QueryNode *ParseExpression (UCArray::const_iterator &here,
                    UCArray::const_iterator end, 
+                   int defaultBoolCOmbine,
                    int defaultStemMethod);
 
@@ -64 +65 @@
 static QueryNode *ParseBracketExpression (UCArray::const_iterator &here,
                       UCArray::const_iterator end, 
+                      int defaultBoolCombine,
                       int defaultStemMethod) {
   // get everything in the expression
-  QueryNode *curTree = ParseExpression (here, end, defaultStemMethod);
+  QueryNode *curTree = ParseExpression (here, end, defaultBoolCombine,
+                    defaultStemMethod);
   
   // gobble up tokens until a closing bracket is found
@@ -282 +285 @@
 static QueryNode *ParseTerm (UCArray::const_iterator &here,
                  UCArray::const_iterator end,
+                 int defaultBoolCombine,
                  int defaultStemMethod) {
   LexEl el;
@@ -289 +293 @@
 
   if (el.lexType == OpenBracketE)
-    return ParseBracketExpression (here, end, defaultStemMethod);
+    return ParseBracketExpression (here, end, defaultBoolCombine,
+                   defaultStemMethod);
 
   ProxMatchQueryNode *proxNode = new ProxMatchQueryNode;
@@ -300 +305 @@
     if (ParseLexEl(here, end, el) && el.lexType == NearOpE) {
       delete proxNode;
-      proxNode = (ProxMatchQueryNode *)ParseTerm(here, end, defaultStemMethod);
+      proxNode = (ProxMatchQueryNode *)ParseTerm(here, end, defaultBoolCombine,
+                         defaultStemMethod);
       SetRangeValues(termNode, el.text);
       proxNode->terms.push_back (termNode);
@@ -330 +336 @@
 static QueryNode *ParseExpression (UCArray::const_iterator &here,
                    UCArray::const_iterator end,
+                   int defaultBoolCombine,
                    int defaultStemMethod) {
   LexEl el;
@@ -344 +351 @@
       // some type of term, back track and parse it
       here = oldHere;
-      curTree = OrAdd (curTree, ParseTerm (here, end, defaultStemMethod));
-      
+      // if default==1, AND, else if==0, OR
+      if (defaultBoolCombine) {
+    curTree = AndAdd (curTree, ParseTerm (here, end, defaultBoolCombine, 
+                          defaultStemMethod));
+      }
+      else {
+    curTree = OrAdd (curTree, ParseTerm (here, end, defaultBoolCombine,
+                         defaultStemMethod));
+      }
+
     } else if (el.lexType == AndOpE) {
-      curTree = AndAdd (curTree, ParseTerm (here, end, defaultStemMethod));
+      curTree = AndAdd (curTree, ParseTerm (here, end, defaultBoolCombine,
+                        defaultStemMethod));
       
     } else if (el.lexType == OrOpE) {
-      curTree = OrAdd (curTree, ParseTerm (here, end, defaultStemMethod));
+      curTree = OrAdd (curTree, ParseTerm (here, end, defaultBoolCombine,
+                       defaultStemMethod));
       
     } else if (el.lexType == NotOpE) {
-      curTree = NotAdd (curTree, ParseTerm (here, end, defaultStemMethod));
+      curTree = NotAdd (curTree, ParseTerm (here, end, defaultBoolCombine,
+                        defaultStemMethod));
       
     } else if (el.lexType == CloseBracketE) {
@@ -368 +386 @@
 }
 
-QueryNode *ParseQuery (const UCArray &queryStr, int defaultStemMethod) {
+QueryNode *ParseQuery (const UCArray &queryStr, int defaultBoolCombine,
+               int defaultStemMethod) {
   UCArray::const_iterator here = queryStr.begin();
   UCArray::const_iterator end = queryStr.end();
-  return ParseExpression (here, end, defaultStemMethod);
-}
+  return ParseExpression (here, end, defaultBoolCombine, defaultStemMethod);
+}