Changeset 349 for trunk/gsdl/src/recpt/queryaction.cpp

Timestamp:

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

Author:

rjmcnab

Message:

Added ability to combine two independant queries.

File:

• trunk/gsdl/src/recpt/queryaction.cpp (modified) (8 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);