Changeset 658

Timestamp:

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

Author:

cs025

Message:

Changes made to assist with eradication of GetEnv elsewhere in the
program.

File:

• trunk/gsdl/src/mgpp/text/mgquery.cpp (modified) (4 diffs)

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

@@ -24 +24 @@
 /*
    $Log$
+   Revision 1.3  1999/10/12 04:12:46  cs025
+   Changes made to assist with eradication of GetEnv elsewhere in the
+   program.
+
    Revision 1.2  1999/10/11 22:01:20  cs025
    Got rid of regular expression calls.
@@ -1272 +1276 @@
         /* [RPAP - Jan 97: Stem Index Change] */
         if (qd->sd->sdh.indexed)
-          BooleanQuery (qd, line, &bqi, (BooleanEnv (GetEnv ("casefold"), 0) |
-                         (BooleanEnv (GetEnv ("stem"), 0) << 1)));
+          bqi.setWordActions(BooleanEnv(GetEnv("casefold"), 0),
+                 BooleanEnv(GetEnv("stem"), 0));
         else
-          BooleanQuery (qd, line, &bqi, qd->sd->sdh.stem_method);
-
+          bqi.setWordActions(0, qd->sd->sdh.stem_method);
+
+        bqi.OptimiseType = atoi (GetEnv ("optimise_type"));
+
+        BooleanQuery (qd, line, &bqi);
         break;
       }
@@ -1286 +1293 @@
         char *maxaccum;
         RankedQueryInfo rqi;
+
         maxdocs = GetDefEnv ("maxdocs", "all");
         maxterms = GetDefEnv ("max_terms", "all");
@@ -1302 +1310 @@
         rqi.StopAtMaxAccum = BooleanEnv (GetEnv ("stop_at_max_accum"), 0);
         rqi.skip_dump = GetEnv ("skip_dump");
+        rqi.setWordActions(BooleanEnv(GetEnv("casefold"), 0),
+                   BooleanEnv(GetEnv("stem"), 0));
         RankedQuery (qd, line, &rqi);
         break;