Changeset 349 for trunk

Timestamp:

1999-07-07T18:13:10+12:00 (25 years ago)

Author:

rjmcnab

Message:

Added ability to combine two independant queries.

Location:

trunk/gsdl/src/recpt

Files:

• queryaction.cpp (modified) (8 diffs)
• querytools.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.11  1999/07/07 06:13:10  rjmcnab
+   Added ability to combine two independant queries.
+
    Revision 1.10  1999/07/07 05:49:35  sjboddie
    had another crack at the format string code - created a new formattools
@@ -81 +84 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
+  // "h2"
+  arg_ainfo.shortname = "h2";
+  arg_ainfo.longname = "main index for second query";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
   // "j"
   arg_ainfo.shortname = "j";
@@ -90 +102 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
+  // "j2"
+  arg_ainfo.shortname = "j2";
+  arg_ainfo.longname = "sub collection index for second query";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
   // "n"
   arg_ainfo.shortname = "n";
@@ -99 +120 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
+  // "n2"
+  arg_ainfo.shortname = "n2";
+  arg_ainfo.longname = "language index for second query";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
   // "q"
   arg_ainfo.shortname = "q";
   arg_ainfo.longname = "query string";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  // "q2"
+  arg_ainfo.shortname = "q2";
+  arg_ainfo.longname = "query string for second query";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  // "cq2"
+  arg_ainfo.shortname = "cq2";
+  arg_ainfo.longname = "combine queries";
   arg_ainfo.multiplechar = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
@@ -370 +418 @@
     while (this_doc != end_doc) {
       textout << outconvert << disp << "<tr>\n"
+
+//            << "<td valign=top nowrap>r: " << (*this_doc).ranking
+//            << " t: " << (*this_doc).num_terms_matched << " p: "
+//            << (*this_doc).num_phrase_match << "</td>\n"
+    
           << get_formatted_string (*this_doc, formatlistptr) << "\n"
           << "</tr>\n";
@@ -377 +430 @@
 
     delete (formatlistptr);
-    
+
     // output the footer
     textout << outconvert << disp << "_query:footer_";
   }
+  
   return true;
 }
@@ -394 +448 @@
   int numdocs = response.numDocs;
   int arg_m = args.getintarg("m");
-  if (numdocs > arg_m)
-    numdocs = arg_m;
+  if (numdocs > arg_m) numdocs = arg_m;
 
   // set up _freqmsg_ and _quotedquery_ macros
@@ -419 +472 @@
   // than MAXDOCS numDocs can be greater than arg_m while
   // isApprox is false.
-  if (response.numDocs > numdocs || 
-      ((response.numDocs == numdocs) && response.isApprox))
-    resline = "_textmorethan_";
+  if (response.isApprox) resline = "_textapprox_";
   if (numdocs == 0) resline = "_textnodocs_";
   else if (numdocs == 1) resline += "_text1doc_";
-  else resline += text_t(numdocs) + " _textlotsdocs_";
+  else resline += text_t(response.numDocs) + " _textlotsdocs_";
 
   disp.setmacro("resultline", "query", resline);

trunk/gsdl/src/recpt/querytools.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.2  1999/07/07 06:12:21  rjmcnab
+   Added ability to combine two independant queries.
+
    Revision 1.1  1999/06/15 02:24:06  sjboddie
    moved do_query from queryaction to new querytools module (as do_action
@@ -78 +81 @@
   }
 
+  // fill in the second query if needed
+  if (!args["cq2"].empty()) {
+    option.name = "CombineQuery";
+    option.value = args["cq2"];
+    request.filterOptions.push_back (option);
+    
+    text_t quotedstring2;
+    text_t formattedstring2 = args["q2"];
+    format_querystring (formattedstring2, quotedstring2);
+
+    option.name = "Term";
+    option.value = formattedstring2;
+    request.filterOptions.push_back (option);
+
+    option.name = "QueryType";
+    option.value = (args.getintarg("t")) ? "ranked" : "boolean";
+    request.filterOptions.push_back (option);
+
+    option.name = "Casefold";
+    option.value = (args.getintarg("k")) ? "true" : "false";
+    request.filterOptions.push_back (option);
+
+    option.name = "Stem";
+    option.value = (args.getintarg("s")) ? "true" : "false";
+    request.filterOptions.push_back (option);
+
+    if (!args["h2"].empty()) {
+      option.name = "Index";
+      option.value = args["h2"];
+      request.filterOptions.push_back (option);
+    }
+
+    if (!args["j2"].empty()) {
+      option.name = "Subcollection";
+      option.value = args["j2"];
+      request.filterOptions.push_back (option);
+    }
+
+    if (!args["n2"].empty()) {
+      option.name = "Language";
+      option.value = args["n2"];
+      request.filterOptions.push_back (option);
+    }
+  }
+  
   option.name = "StartResults";
   option.value = args["r"];