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

Timestamp:

1999-06-24T17:12:25+12:00 (25 years ago)

Author:

sjboddie

Message:

lots of small changes

File:

• trunk/gsdl/src/recpt/queryaction.cpp (modified) (9 diffs)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.6  1999/06/24 05:12:25  sjboddie
+   lots of small changes
+
    Revision 1.5  1999/06/16 04:03:48  sjboddie
    Now sets "cl" arg to "search" when going to a document from a search
@@ -90 +93 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
-  // "t"
+  // "t" - 1 = ranked 0 = boolean
   arg_ainfo.shortname = "t";
   arg_ainfo.longname = "search type";
   arg_ainfo.multiplechar = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "0";
+  arg_ainfo.argdefault = "1";
   arg_ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -160 +163 @@
   if (arg_t != 0 && arg_t != 1) {
     logout << "Warning: \"t\" argument out of range (" << arg_t << ")\n";
-    args["t"] = argsinfo["t"].argdefault;
+    cgiarginfo *tinfo = argsinfo.getarginfo ("t");
+    if (tinfo != NULL) args["t"] = tinfo->argdefault;
   }
 
@@ -167 +171 @@
   if (arg_k != 0 && arg_k != 1) {
     logout << "Warning: \"k\" argument out of range (" << arg_k << ")\n";
-    args["k"] = argsinfo["k"].argdefault;
+    cgiarginfo *kinfo = argsinfo.getarginfo ("k");
+    if (kinfo != NULL) args["k"] = kinfo->argdefault;
   }
 
@@ -174 +179 @@
   if (arg_s != 0 && arg_s != 1) {
     logout << "Warning: \"s\" argument out of range (" << arg_s << ")\n";
-    args["s"] = argsinfo["s"].argdefault;
+    cgiarginfo *sinfo = argsinfo.getarginfo ("s");
+    if (sinfo != NULL) args["s"] = sinfo->argdefault;
   }
 
@@ -181 +187 @@
   if (arg_m < 0) {
     logout << "Warning: \"m\" argument less than 0 (" << arg_m << ")\n";
-    args["m"] = argsinfo["m"].argdefault;
+    cgiarginfo *minfo = argsinfo.getarginfo ("m");
+    if (minfo != NULL) args["m"] = minfo->argdefault;
   }
 
@@ -188 +195 @@
   if (arg_o < 0) {
     logout << "Warning: \"o\" argument less than 0 (" << arg_o << ")\n";
-    args["o"] = argsinfo["o"].argdefault;
+    cgiarginfo *oinfo = argsinfo.getarginfo ("o");
+    if (oinfo != NULL) args["o"] = oinfo->argdefault;
   }
 
@@ -195 +203 @@
   if (arg_r < 1) {
     logout << "Warning: \"r\" argument less than 1 (" << arg_r << ")\n";
-    args["r"] = argsinfo["r"].argdefault;
+    cgiarginfo *rinfo = argsinfo.getarginfo ("r");
+    if (rinfo != NULL) args["r"] = rinfo->argdefault;
   }
 
@@ -387 +396 @@
 
   // can't use isApprox here as it will be false as long 
-  // as numDocs < MAXDOCS (currently 200). If arg_m is less
+  // as numDocs < MAXDOCS (currently 500). If arg_m is less
   // than MAXDOCS numDocs can be greater than arg_m while
   // isApprox is false.
-  if (response.numDocs >= numdocs) resline = "_textmorethan_";
+  if (response.numDocs > numdocs || 
+      ((response.numDocs == numdocs) && response.isApprox))
+    resline = "_textmorethan_";
   if (numdocs == 0) resline = "_textnodocs_";
   else if (numdocs == 1) resline += "_text1doc_";
-  else resline += text_t(numdocs) + "_textlotsdocs_";
+  else resline += text_t(numdocs) + " _textlotsdocs_";
 
   disp.setmacro("resultline", "query", resline);