Changeset 1769

Timestamp:

2000-12-08T11:31:53+13:00 (23 years ago)

Author:

kjm18

Message:

added options for ranked/non-ranked, all/some searches

File:

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

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

@@ -99 +99 @@
    
   int defaultStemMethod = 1; // casefolded, unstemmed
-
+  int defaultBoolCombine = 0; // OR
   BrowseQueryNode browseNode;
   browseNode.startPosition = -10;
@@ -107 +107 @@
 
   while (true) {
-    //    cerr << "getting next line\n";
     cout << "> ";
     cin.getline(query, 2048, '\n');
@@ -116 +115 @@
       if (queryArray[1] == 'q') break;  // quit
       
-
       if (queryArray[1] == 'i') {
     cout << "current index="<< queryInfo.docLevel << "\nchange to index:";
@@ -148 +146 @@
     cout << docText << "\n";
       }
+      else if (queryArray[1] == 't') { // query type - all/some
+    if (queryArray[2] == '1') defaultBoolCombine = 1;
+    else if (queryArray[2] == '0') defaultBoolCombine = 0;
+    else {
+      cout << "Error: please enter .t0 (some) or .t1 (all)\n";
+    }
+      }
+      else if (queryArray[1] == 'r') { // ranking - on/off
+    if (queryArray[2] == '1') queryInfo.sortByRank = true;
+    else if (queryArray[2] == '0') queryInfo.sortByRank = false;
+    else {
+      cout << "Error: please enter .r0 (non-ranked) or .r1 (ranked)\n";
+    }
+      }
       else if (queryArray[1] == 'b') {
     // full text browse
@@ -163 +175 @@
     cout << "\n";
 
-    } 
-    } else {
+      } 
+    } // if a .x query
+    else {
       // regular query
-      queryTree = ParseQuery (queryArray, defaultStemMethod);
+      queryTree = ParseQuery (queryArray, defaultBoolCombine, defaultStemMethod);
 
       // print the query
@@ -187 +200 @@
 }
 
+