Changeset 1848

Timestamp:

2001-01-22T14:50:19+13:00 (23 years ago)

Author:

kjm18

Message:

checks added for failure of IndexData.loadLevel()

File:

• trunk/gsdl/src/mgpp/text/MGQuery.cpp (modified) (5 diffs)

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

@@ -48 +48 @@
 }
 
-
+  
 
 QueryNode::QueryNode () {
@@ -624 +624 @@
 
   // make sure level is current
-  indexData.LoadLevel (queryInfo.docLevel);
-  
+  if (!indexData.LoadLevel (queryInfo.docLevel)) {
+    return;
+  }
   // do query
-  if (queryTree != NULL)
-    (*queryTree).Calculate (indexData, queryInfo, result);
+  if (queryTree == NULL) return;
+  
+  (*queryTree).Calculate (indexData, queryInfo, result);
 
   // make weights into ranks if needed
@@ -638 +640 @@
     }
   }
-
+  
   unsigned long resultsSize = queryInfo.maxDocs;
   if (resultsSize == 0 || resultsSize > result.docs.size())
@@ -700 +702 @@
 // in QueryResult.docs and if a second level is specified, 
 // it will return corresponding docnums for that level in QueryResult.levels
+// If there is no level specified, or that level is invalid, the query
+// level is used
 void MGQuery (IndexData &indexData,
           const QueryInfo &queryInfo,
@@ -729 +733 @@
 
   // the new level info
-  indexData.LoadLevel(level);
+  if (!indexData.LoadLevel(level)) {
+    realresult.levels = result.docs;
+    return;
+  }
   
   unsigned long DocNum = 0;