Changeset 926

Timestamp:

2000-02-16T11:38:28+13:00 (24 years ago)

Author:

kjm18

Message:

added options to change index and level for searching

File:

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

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

@@ -33 +33 @@
 int main (int argc, char **argv) {
   int ch;
-  char *filename = "";
+  char *textfilename = "";
+  char *indexfilename = "";
   char *basePath = "";
   
@@ -40 +41 @@
   
   // process the command line arguments
-  while ((ch = getopt (argc, argv, "f:d:h")) != -1) {
+  while ((ch = getopt (argc, argv, "f:t:d:h")) != -1) {
     switch (ch) {
     case 'f':       /* input file */
-      filename = optarg;
+      indexfilename = optarg;
+      break;
+    case 't':
+      textfilename = optarg;
       break;
     case 'd':
@@ -56 +60 @@
   }
 
-  if (filename[0] == '\0') {
-    FatalError (1, "A file name must be specified with -f\n");
+  if (textfilename[0] == '\0' || indexfilename[0] == '\0') {
+    FatalError (1, "A file name must be specified with -f and -t \n");
   }
   
   // init the text system
   TextData textData;
-  if (!textData.LoadData (filename)) {
-    FatalError (1, "Couldn't load text information for \"%s\"", filename);
+  if (!textData.LoadData (textfilename)) {
+    FatalError (1, "Couldn't load text information for \"%s\"", textfilename);
   }
   
   // init the query system
   IndexData indexData;
-  if (!indexData.LoadData (basePath, filename)) {
-    FatalError (1, "Couldn't load index information for \"%s\"", filename);
+  if (!indexData.LoadData (basePath, indexfilename)) {
+    FatalError (1, "Couldn't load index information for \"%s\"", indexfilename);
   }
 
   // do querying
   QueryInfo queryInfo;
-  SetCStr (queryInfo.docLevel, "Chapter");
-  queryInfo.maxDocs = 10;
+  SetCStr (queryInfo.docLevel, "Document");
+  queryInfo.maxDocs = 50;
   queryInfo.sortByRank = true;
   queryInfo.exactWeights = false;
@@ -81 +85 @@
   queryInfo.needTermFreqs = true;
   
-  QueryResult queryResult;
+  ExtQueryResult queryResult;
   char query[2048];
   UCArray queryArray;
   QueryNode *queryTree = NULL;
+
+  UCArray level;
+  level.clear();
+  //SetCStr(level, "");
+      
 
   while (true) {
@@ -95 +104 @@
     if (queryArray.size() >= 2 && queryArray[0] == '.') {
       if (queryArray[1] == 'q') break;  // quit
+      
 
-      if (queryArray[1] == 'p') {
+      if (queryArray[1] == 'i') {
+    cout << "current index="<< queryInfo.docLevel << "\nchange to index:";
+    cin >> query;
+    queryInfo.docLevel.clear();
+    SetCStr(queryInfo.docLevel, query);
+    cout << "index set to " << queryInfo.docLevel <<"\n";
+    cin.getline(query, 2048, '\n');
+      }
+      if (queryArray[1] == 'l') {
+    cout << "current level="<< level << "\nchange to level:";
+    cin >> query;
+    level.clear();
+    SetCStr(level, query);
+    cout << "level set to " << level <<"\n";
+    cin.getline(query, 2048, '\n');
+      }
+
+
+      else if (queryArray[1] == 'p') {
     // print
     UCArray docText;
@@ -117 +145 @@
       PrintNode (cout, queryTree);
 
-      MGQuery (indexData, queryInfo, queryTree, queryResult);
+      MGQuery (indexData, queryInfo, queryTree, queryResult, level);
       cout << queryResult;
       cout << "\n";