Changeset 12912

Timestamp:

2006-09-28T16:52:34+12:00 (18 years ago)

Author:

kjdon

Message:

turned off accent folding if partial matching is being done - can't do them together due to the way the index works. also, do the accentfold cases for the switch in GetStemMethod only if ENABLE_ACCENTFOLD is defined

File:

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

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

@@ -150 +150 @@
   /* Changed to use CHAR_FLAG_STEM* constants from mg_files.h */
   while(here != end) {
-    unsigned char ch = *here; 
-    if (strchr (CHAR_FLAG_STEM_Validator, ch) == NULL)
-        return STEM_INVALID; // incorrect format
-
-    switch(ch) {
-        case CHAR_FLAG_STEM_CaseFold:       // ignore case (fold)
-            stem |= STEM_CaseFolding;
-            break;
-        case CHAR_FLAG_STEM_NoCaseFold:     // case sensitive 
-            stem &= (~STEM_CaseFolding);
-            break;
-        case CHAR_FLAG_STEM_Stemming:       // stem words
-            stem |= STEM_Stemming;
-            break;
-        case CHAR_FLAG_STEM_NoStemming:     // do not stem words
-            stem &= (~STEM_Stemming);
-            break;
-        case CHAR_FLAG_STEM_AccentFold:     // accent fold
-            stem |= STEM_AccentFolding;
-            break;
-        case CHAR_FLAG_STEM_NoAccentFold:   // do no accent folding
-            stem &= (~STEM_AccentFolding);
-            break;
-    };
-
-    ++here;     
+    unsigned char ch = *here; 
+    if (strchr (CHAR_FLAG_STEM_Validator, ch) == NULL)
+      return STEM_INVALID; // incorrect format
+    
+    switch(ch) {
+    case CHAR_FLAG_STEM_CaseFold:       // ignore case (fold)
+      stem |= STEM_CaseFolding;
+      break;
+    case CHAR_FLAG_STEM_NoCaseFold:     // case sensitive 
+      stem &= (~STEM_CaseFolding);
+      break;
+    case CHAR_FLAG_STEM_Stemming:       // stem words
+      stem |= STEM_Stemming;
+      break;
+    case CHAR_FLAG_STEM_NoStemming:     // do not stem words
+      stem &= (~STEM_Stemming);
+      break;
+#ifdef ENABLE_ACCENTFOLD 
+   case CHAR_FLAG_STEM_AccentFold:      // accent fold
+      stem |= STEM_AccentFolding;
+      break;
+    case CHAR_FLAG_STEM_NoAccentFold:   // do no accent folding
+      stem &= (~STEM_AccentFolding);
+      break;
+#endif
+    };
+    
+    ++here;     
   }
   return stem;
@@ -205 +207 @@
       termNode.stemMethod = (unsigned long)defaultStemMethod;
     } 
-      }else here = oldHere; //ignore - wrong syntax
+      } else here = oldHere; //ignore - wrong syntax
 
     } else if (el.lexType == RangeE) {
@@ -222 +224 @@
     
     if (partial_match) {
-      /* [JFG - Mar 06: Accent folding patch] */
-      /* use STEM_PARTIAL_MATCH flag */
-      termNode.stemMethod |= STEM_PARTIAL_MATCH;    // set partial match flag
-      termNode.stemMethod &= (~STEM_Stemming);      // we dont have stemming on if doing partial matching.
+      /* [JFG - Mar 06: Accent folding patch] */
+      /* use STEM_PARTIAL_MATCH flag */
+      termNode.stemMethod |= STEM_PARTIAL_MATCH; // set partial match flag
+      termNode.stemMethod &= (~STEM_Stemming); // we dont have stemming on if doing partial matching.
+      termNode.stemMethod &= (~STEM_AccentFolding); // we dont have accentfolding on if doing partial matching.
     }
     oldHere = here;