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

Timestamp:

1999-07-16T12:12:47+12:00 (25 years ago)

Author:

sjboddie

Message:

removed all the old post-processing stuff

File:

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

trunk/gsdl/src/colservr/mgsearch.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.13  1999/07/16 00:12:46  sjboddie
+   removed all the old post-processing stuff
+
    Revision 1.12  1999/07/07 06:17:47  rjmcnab
    broke search_index into index+subcollection+language
@@ -102 +105 @@
 /////////////
 
-static char *quotedquery = NULL;
-static int casefold;
-
 static char *tempdoc = NULL;
 static int templen = 0;
@@ -152 +152 @@
 // it assumes that cache_num is set up correctly to point to
 // a suitable result cache
-int ourquerycallback(char *UDoc, int /*ULen*/, int DocNum, 
+int ourquerycallback(char */*UDoc*/, int /*ULen*/, int DocNum, 
              float Weight, void *info) {
 
   
   queryresultsclass *queryresults = (queryresultsclass * )info;
-
-  // check the returned document for the presence of the
-  // quoted part of the query, if there was one
- 
-  //  if (UDoc != NULL && quotedquery != NULL &&
-  //    quotedquery[0] != '\0' && strstr (UDoc, quotedquery) == NULL) return 0;
-  
-  
-  if (UDoc != NULL && quotedquery != NULL && quotedquery[0] != '\0') {
-
-      if (casefold) {
-          int len;
-          for (len = 0; quotedquery[len] != '\0'; len ++)
-              quotedquery[len] = tolower (quotedquery[len]);
-          for (len = 0; UDoc[len] != '\0'; len ++)
-              UDoc[len] = tolower (UDoc[len]);
-      }
-      if (strstr (UDoc, quotedquery) == NULL) return 0;
-  }
 
   // append this entry to the document results
@@ -277 +258 @@
 static text_t getindexsuffix (const text_t &collection, 
                   const text_t &index) {
-  text_t indexsuffix = "index";
+
+  text_t indexsuffix = "index";  
+  // temporary hack so old version of niupepa collection
+  // can stay up until new one's finished
+  if (collection == "niupepa") indexsuffix = "index.new";
+
   indexsuffix = filename_cat (indexsuffix, index);
   indexsuffix = filename_cat (indexsuffix, collection);
@@ -386 +372 @@
   // the database was loaded)
   if (queryhere == queryend) return true;
-
-  casefold = queryparams.casefolding;
 
   if (makeindexcurrent (queryparams.index, queryparams.subcollection,
@@ -442 +426 @@
   // sort out the query string
   text_t ttquerystring = queryparams.querystring;
-  text_t ttquotedquery;
-  //  extractquoted (ttquerystring, ttquotedquery);
   filterquery (ttquerystring);
-  
-  // turn the strings into c strings for mg
-  if (quotedquery != NULL) // quotedquery is a global
-    {
-      delete quotedquery;
-      quotedquery = NULL;
-    }
-
-  // quotedquery will be deleted on the next call to this function
-  quotedquery = to_utf8(ttquotedquery).getcstr ();
   char *querystring = to_utf8(ttquerystring).getcstr();
   
@@ -466 +438 @@
 void mgsearchclass::getresults (const queryparamclass &queryparams,
                 queryresultsclass &queryresults) {
-  if (quotedquery[0] == '\0') { 
-    // don't need the text
-    mgq_results(result_docnums, 0, MAXNUMDOCS, 
-        ourquerycallback, (void *)(&queryresults));
-  } else {
-    // we need the text for this one
-    mgq_results(result_docs, 0, MAXNUMDOCS, 
-        ourquerycallback, (void *)(&queryresults));
-  }
+
+  mgq_results(result_docnums, 0, MAXNUMDOCS, 
+          ourquerycallback, (void *)(&queryresults));
   
   // get the term frequencies
@@ -501 +467 @@
   }
 }
-
-
-void mgsearchclass::extractquoted (text_t &ttquerystring, text_t &ttquotedquery)
-{
-  ttquotedquery.clear();
-
-  text_t::iterator ithere = ttquerystring.begin ();
-  text_t::iterator itend = ttquerystring.end ();
-
-  bool inquote = false;
-
-  while (ithere != itend)
-    {
-      if ((*ithere) == '\"')
-    {
-      if (!inquote) ttquotedquery.clear ();
-      inquote = !inquote;
-      *ithere = ' '; // delete the quote
-    }
-      else if (inquote)
-    {
-      ttquotedquery.push_back(*ithere);
-      *ithere = ' ';
-    }
-      
-      ithere++;
-    }
-}
-
 
 void mgsearchclass::filterquery (text_t &ttquerystring) {