Changeset 12882

Timestamp:

2006-09-28T10:32:28+12:00 (18 years ago)

Author:

kjdon

Message:

added accentfolding option. setting up default stem method now uses defines from mg_files

File:

• trunk/gsdl/src/mgpp/text/Queryer.cpp (modified) (6 diffs)

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

@@ -50 +50 @@
        << "\t.c0/.c1\t\tcasefolding off/on\n"
        << "\t.s0/.s1\t\tstemming off/on\n"
+       << "\t.a0/.a1\t\taccentfolding off/on\n"
        << "\t.o0/.o1\t\tshort output off/on\n"
        << "\t.m\t\tset maxnumeric (enter the number at the prompt)\n\n"
@@ -91 +92 @@
   
   // init the text system
-    TextData textData;
+  TextData textData;
   if (!textData.LoadData (basePath, textfilename)) {
     FatalError (1, "Couldn't load text information for \"%s\"", textfilename);
@@ -134 +135 @@
   //SetCStr(level, "");
    
-  int defaultStemMethod = 0; // uncasefolded, unstemmed
+  int defaultStemMethod = 0; // uncasefolded, unstemmed, unaccentfolded
   int defaultBoolCombine = 0; // OR
   bool shortOutput = false;
@@ -207 +208 @@
       }
       else if (queryArray[1] == 'c') { // casefolding - on/off
-    if (queryArray[2] == '1') defaultStemMethod |= 1;
-    else if (queryArray[2] == '0') defaultStemMethod &= 0xe;
+    if (queryArray[2] == '1') defaultStemMethod |= STEM_CaseFolding;
+    else if (queryArray[2] == '0') defaultStemMethod &= (~STEM_CaseFolding);
     else {
       cout << "Error: please enter .c0 (case sensitive) or .c1 (casefolded)\n";
@@ -214 +215 @@
       }
       else if (queryArray[1] == 's') { // stemming - on/off
-    if (queryArray[2] == '1') defaultStemMethod |=2;
-    else if (queryArray[2] == '0') defaultStemMethod &=0xd;
+    if (queryArray[2] == '1') defaultStemMethod |= STEM_Stemming;
+    else if (queryArray[2] == '0') defaultStemMethod &= (~STEM_Stemming);
     else {
       cout << "Error: please enter .s0 (unstemmed) or .s1 (stemmed)\n";
     }
       }      
+      else if (queryArray[1] == 'a') { // accentfolding - on/off
+    if (queryArray[2] == '1') defaultStemMethod |= STEM_AccentFolding;
+    else if (queryArray[2] == '0') defaultStemMethod &= (~STEM_AccentFolding);
+    else {
+      cout << "Error: please enter .a0 (accent sensitive) or .a1 (accentfolded)\n";
+    }
+      }
       else if (queryArray[1] == 'o') { // output - short/long
     if (queryArray[2] == '1') shortOutput = true;
@@ -274 +282 @@
 
   // clean up, everybody clean up
-    textData.UnloadData ();
+  textData.UnloadData ();
   indexData.UnloadData ();