Changeset 350 for trunk/gsdl/src/colservr/mgsearch.cpp

Timestamp:

1999-07-07T18:17:48+12:00 (25 years ago)

Author:

rjmcnab

Message:

broke search_index into index+subcollection+language
within mgsearch

File:

• trunk/gsdl/src/colservr/mgsearch.cpp (modified) (12 diffs)

trunk/gsdl/src/colservr/mgsearch.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.12  1999/07/07 06:17:47  rjmcnab
+   broke search_index into index+subcollection+language
+   within mgsearch
+
    Revision 1.11  1999/07/05 21:06:43  rjmcnab
    Disabled quoted strings.
@@ -179 +183 @@
   docresult.docweight = Weight - docresult.num_query_terms_matched*100;
   
-  queryresults->docs.push_back(docresult);
+  queryresults->docs.docset[DocNum] = docresult;
+  queryresults->docs.docorder.push_back(DocNum);
   
   return 0;
@@ -255 +260 @@
   term.setcarr(Word, ULen);
   queryresultsclass *queryresults = (queryresultsclass *)info;
-  queryresults->termvariants.push_back(to_uni(term));
+  queryresults->termvariants.insert(to_uni(term));
 
   return 0;
@@ -310 +315 @@
 // makeindexcurrent returns true if it was able to load the database
 bool mgsearchclass::makeindexcurrent (const text_t &index,
+                      const text_t &subcollection,
+                      const text_t &language,
                       const text_t &collection,
                       int casefolding,
@@ -318 +325 @@
   char *ccollection = collection.getcstr();
   assert (ccollection != NULL);
-  char *idxsuffix = (getindexsuffix (collection, index)).getcstr();
+  char *idxsuffix = (getindexsuffix (collection, (index+subcollection+language))).getcstr();
   assert (idxsuffix != NULL);
   char *txtsuffix = (getindexsuffix (collection, "text")).getcstr();
@@ -382 +389 @@
   casefold = queryparams.casefolding;
 
-  if (makeindexcurrent (queryparams.search_index, queryparams.collection)) {
+  if (makeindexcurrent (queryparams.index, queryparams.subcollection,
+            queryparams.language, queryparams.collection)) {
     setsearchmode (queryparams);
     submitquery (queryparams);
@@ -420 +428 @@
   mgq_ask(".set heads_length 150");
   
-  char maxdocstr[32];
-  sprintf(maxdocstr, ".set maxdocs %i", queryparams.maxdocs);
-  mgq_ask(maxdocstr);
+  if (queryparams.maxdocs == -1) {
+    mgq_ask(".set maxdocs all");
+  } else {
+    char maxdocstr[32];
+    sprintf(maxdocstr, ".set maxdocs %i", queryparams.maxdocs);
+    mgq_ask(maxdocstr);
+  }
 }
 
@@ -479 +491 @@
   if (total_retrieved == 0) {
     // not available (or really was zero)
-    queryresults.docs_matched = queryresults.docs.size();
+    queryresults.docs_matched = queryresults.docs.docset.size();
     if (queryresults.docs_matched < queryparams.maxdocs)
       queryresults.is_approx = true;
@@ -537 +549 @@
 // collection is loaded. If no index has been loaded
 // defaultindex is needed to load one
-bool mgsearchclass::docTargetDocument(const text_t &defaultindex, 
+bool mgsearchclass::docTargetDocument(const text_t &defaultindex,
+                      const text_t &defaultsubcollection,
+                      const text_t &defaultlanguage,
                       const text_t &collection,
                       int docnum,
@@ -546 +560 @@
   char *mgdoc = NULL;
   int doclen = 0;
-  if (!mgdocument (defaultindex, collection, docnum, mgdoc, doclen)) return false;
+  if (!mgdocument (defaultindex, defaultsubcollection, defaultlanguage,
+           collection, docnum, mgdoc, doclen)) return false;
   if (mgdoc == NULL) return false;
 
@@ -569 +584 @@
 
 bool mgsearchclass::mgdocument (const text_t &defaultindex, 
+                const text_t &defaultsubcollection,
+                const text_t &defaultlanguage,
                 const text_t &collection,
                 int docnum,
@@ -583 +600 @@
   
   // try and load the database
-  if (!databaseloaded) databaseloaded = makeindexcurrent (defaultindex, collection);
+  if (!databaseloaded) databaseloaded = makeindexcurrent (defaultindex, defaultsubcollection,
+                              defaultlanguage, collection);
   
   if (databaseloaded) {