Changeset 660

Timestamp:

1999-10-12T17:13:52+13:00 (25 years ago)

Author:

cs025

Message:

Calls to GetEnv eradicated; interface to parsing of query text
cleaned up.

File:

• trunk/gsdl/src/mgpp/text/query.ranked.cpp (modified) (10 diffs)

trunk/gsdl/src/mgpp/text/query.ranked.cpp

@@ -51 +51 @@
 /*
    $Log$
+   Revision 1.2  1999/10/12 04:13:52  cs025
+   Calls to GetEnv eradicated; interface to parsing of query text
+   cleaned up.
+
    Revision 1.1  1999/10/11 02:58:14  cs025
    Base install of MG-PP
@@ -90 +94 @@
   public:
     float *OrgWeight;
+
+    HeapEntry()
+    {
+      // do nothing
+    }
 
     inline void chain(int docno, float *weightPtr)
@@ -323 +332 @@
 /* [RPAP - Jan 97: Stem Index Change] */
 static TermList *
-ParseRankedQuery (stemmed_dict * sd, char *QueryLine, int Sort, int indexed,
+ParseRankedQuery (query_data *qd, char *QueryLine, 
+          RankedQueryInfo *rqi,
           QueryTermList **query_term_list)  /* [RPAP - Feb 97: Term Frequency] */
 {
@@ -336 +346 @@
   *query_term_list = QueryTermList_create(0);  /* [RPAP - Feb 97: Term Frequency] */
 
-  if (indexed)
-    default_stem_method = BooleanEnv (GetEnv ("casefold"), 0) | (BooleanEnv (GetEnv ("stem"), 0) << 1);
+  /* [RPAP - Jan 97: Stem Index Change] */
+  if (qd->sd->sdh.indexed)
+    default_stem_method = rqi->getWordSpecial();
+      //BooleanEnv (GetEnv ("casefold"), 0) | (BooleanEnv (GetEnv ("stem"), 0) << 1);
   else
-    default_stem_method = sd->sdh.stem_method;
+    default_stem_method = qd->sd->sdh.stem_method;
 
   while (s_in <= end)
@@ -382 +394 @@
         case (STEMPARAM):
           stem_param = atoi (param);
-          if (errno != ERANGE && indexed && stem_param >= 0 && stem_param <= 3)
+          if (errno != ERANGE && qd->sd->sdh.indexed && stem_param >= 0 && stem_param <= 3)
         method_using = stem_to_apply = stem_param;
           break;
@@ -389 +401 @@
 
       bcopy ((void *) Word, (void *) sWord, *Word + 1);
-      stemmer (stem_to_apply, sd->sdh.stemmer_num, sWord);
-
-      if (!indexed || stem_to_apply == 0)
+      stemmer (stem_to_apply, qd->sd->sdh.stemmer_num, sWord);
+
+      if (!qd->sd->sdh.indexed || stem_to_apply == 0)
     {
       /* Look for the word in the already identified terms */
@@ -410 +422 @@
         {
           /* Look for it in the stemmed dictionary */
-          if ((word_num = FindWord (sd, sWord, &count, &doc_count,
+          if ((word_num = FindWord (qd->sd, sWord, &count, &doc_count,
                     &invf_ptr, &invf_len)) != -1)
         {
@@ -460 +472 @@
       TermList *tempList = TermList_create (0);
 
-      if ((num_entries = FindWords (sd, sWord, stem_to_apply, &tempList)) > 0)
+      if ((num_entries = FindWords (qd->sd, sWord, stem_to_apply, &tempList)) > 0)
         {
           int i;
@@ -512 +524 @@
     } /* end while */
 
-  if (Sort)
+  if (rqi->Sort)
     /* Sort the terms in ascending order by doc_count */
     qsort (Terms->TE, Terms->size(), sizeof (TermEntry), doc_count_comp);
@@ -1071 +1083 @@
     QueryTermList_free (&(qd->QTL));
 
-  qd->TL = ParseRankedQuery (qd->sd, Query, rqi->Sort, qd->sd->sdh.indexed,  /* [RPAP - Jan 97: Stem Index Change] */
-                 &(qd->QTL));  /* [RPAP - Feb 97: Term Frequency] */
+  qd->TL = ParseRankedQuery (qd, Query, rqi, &(qd->QTL));  /* [RPAP - Feb 97: Term Frequency] */
 
   /*  TermList_print (qd->TL, stderr); */