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

Timestamp:

1999-11-04T11:49:50+13:00 (25 years ago)

Author:

sjboddie

Message:

A few changes to cross-collection searching for fao

File:

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

trunk/gsdl/src/recpt/queryaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.28  1999/11/03 22:49:50  sjboddie
+   A few changes to cross-collection searching for fao
+
    Revision 1.27  1999/11/01 21:53:27  sjboddie
    added cross-collection searching capability - still needs lots of
@@ -535 +538 @@
   text_t &language = args["n"];
 
+  text_tset collections;
+  text_t arg_cc = args["cc"];
+  decode_cgi_arg (arg_cc);
+  splitchar (arg_cc.begin(), arg_cc.end(), ',', collections);
+
   textout << outconvert << disp << "_query:header_\n"
       << "<center>_navigationbar_</center><br>\n"
@@ -547 +555 @@
       << "<td><input type=\"submit\" value=\"_query:textbeginsearch_\"></td>\n"
       << "</tr></table></center>\n"
-      << "<center><table width=_pagewidth_>\n";
-
+      << "<center><table width=_pagewidth_>\n"
+      << "<tr><td>\n";
   
   recptprotolistclass::iterator rprotolist_here = protos->begin();
@@ -606 +614 @@
         
           // we've got a matching collection
+          textout << "<input type=checkbox";
+
+          text_tset::const_iterator t = collections.find (*collist_here);
+          if (t != collections.end()) textout << " checked";
+
           textout << outconvert 
-              << "<tr><td><input type=checkbox checked name=cc value=\""
-              << *collist_here << "\"></td><td>\n";
+              << " name=cc value=\"" << *collist_here << "\">";
           
           if (!cinfo.collectionmeta["collectionname"].empty())
@@ -615 +627 @@
         textout << outconvert << *collist_here;
           
-          textout << "\n</td><td>";
+          textout << "<br>\n";
           
         }
-        
-        textout << "\n</td></tr>\n";
       }
       collist_here ++;
@@ -628 +638 @@
   }
   textout << outconvert << disp 
-      << "</table></center>\n"
+      << "</td></tr></table></center>\n"
       << "</form>\n"
       << "_query:footer_\n";
@@ -640 +650 @@
   
   if (args["ccs"] == 1) {
-    // cross collection searching
-    if (args["ccp"] != 1) {
+    // cross collection searching (we'll just borrow the el argument
+    // from extlinkaction for now - this will probably want to use 
+    // a separate argument eventually)
+    if (args["ccp"] != 1 && args["el"] != "direct") {
       // display the cross collection search page
       output_ccp (args, protos, disp, outconvert, textout, logout);