Changeset 2646 for trunk

Timestamp:

2001-07-12T14:48:18+12:00 (23 years ago)

Author:

jrm21

Message:

fixed a bug where z3950 collections would die when retrieving a document -
we now pass all required information to the filter() - ie queryterm,
type (boolean|ranked) and field (title|author|any).

Location:

trunk/gsdl/src/recpt

Files:

• documentaction.cpp (modified) (2 diffs)
• z3950proto.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -582 +582 @@
     comerror_t err;
     OptionValue_tarray options;
-    // we need to know what the query was for the z3950proto
+    // we need to do the query again for the z3950proto
     if (collectproto->get_protocol_name(err)=="z3950proto") {
       OptionValue_t opt;
-      opt.name="Query";
-      opt.value=args["q"];
+      opt.name="Term";opt.value=args["q"];options.push_back(opt);
+      opt.name="QueryType";
+      opt.value=(args.getintarg("t")) ? "ranked" : "boolean";
       options.push_back(opt);
+      opt.name="Index";opt.value=args["h"];options.push_back(opt);
     }
     
@@ -757 +759 @@
       
     // output the table of contents
-    logout << "formatinfo.RelatedDocs: " << formatinfo.RelatedDocuments.getcstr() << endl;
     output_toc (args, browsers, formatinfo, collectproto, 
         disp, outconvert, textout, logout);

trunk/gsdl/src/recpt/z3950proto.cpp

@@ -343 +343 @@
       `EndResults'=`20'
       `Term'=`firstword secondword' (term is just whatever the user typed in)
-      `QueryType'=`ranked' => 'OR' (cgiarg t=1)
-      `QueryType' = `boolean' => 'AND' (cgiarg t=0)
+      `QueryType'=ranked|boolean   -> OR|AND
+      //`MatchMode'=`some' => 'OR'
+      //`MatchMode' = `all' => 'AND'
       `Casefold'=`true'
       `Stem'=`false'
@@ -490 +491 @@
         OptionValue_tarray::iterator opt_end=request.filterOptions.end();
         while (opthere!=opt_end) {
-          if (opthere->name=="Query") {
+          if (opthere->name=="Term") {
         query=opthere->value;
-        break;
+          } else if (opthere->name=="Index") {
+        field=opthere->value;
+          } else if (opthere->name=="QueryType") {
+        if (opthere->value=="ranked") querytype=1;
+        else if (opthere->value=="boolean") querytype=2;
+        else { /* error - shouldn't happen */
+          /* currently unhandled */
+        }
           }
           opthere++;