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

Timestamp:

1999-07-09T14:17:55+12:00 (25 years ago)

Author:

rjmcnab

Message:

Setting macros needed for a second query.

File:

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

trunk/gsdl/src/recpt/queryaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.12  1999/07/09 02:17:55  rjmcnab
+   Setting macros needed for a second query.
+
    Revision 1.11  1999/07/07 06:13:10  rjmcnab
    Added ability to combine two independant queries.
@@ -147 +150 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
-  // "cq2"
+  // "cq2" ""=don't combine, "and", "or", "not"
   arg_ainfo.shortname = "cq2";
   arg_ainfo.longname = "combine queries";
@@ -333 +336 @@
 
   // some or all of these may not be required to be set
-  // _hselection_  the selection box for the main part of the index
-  // _jselection_  the selection box for the subcollection part of the index
-  // _nselection_  the selection box for the language part of the index
-
+  // _hselection_, _h2selection_  the selection box for the main part of the index
+  // _jselection_, _j2selection_  the selection box for the subcollection part of the index
+  // _nselection_, _n2selection_  the selection box for the language part of the index
+  // _cq2selection                the selection box for combining two queries
+  
   
   // can't do anything if collectproto is null (i.e. no collection was specified)
@@ -348 +352 @@
   collectproto->get_filteroptions (args["c"], request, response, err, logout);
   if (err == noError) {
-
+    
     FilterOption_tmap::const_iterator it;
     FilterOption_tmap::const_iterator end = response.filterOptions.end();
-
-    // _hselection_ (Index)
+    
+    // _hselection_ and _h2selection_ (Index)
     it = response.filterOptions.find ("Index");
-      if (it != end) set_option_macro ("h", args["h"], (*it).second, disp);
-
-    // _jselection_ (Subcollection)
+    if (it != end) set_option_macro ("h", args["h"], (*it).second, disp);
+    if (it != end) set_option_macro ("h2", args["h2"], (*it).second, disp);
+    
+    // _jselection_ and _j2selection_ (Subcollection)
     it = response.filterOptions.find ("Subcollection");
-      if (it != end) set_option_macro ("j", args["j"], (*it).second, disp);
-
-    // _nselection_ (Language)
+    if (it != end) set_option_macro ("j", args["j"], (*it).second, disp);
+    if (it != end) set_option_macro ("j2", args["j2"], (*it).second, disp);
+    
+    // _nselection_ and _n2selection_ (Language)
     it = response.filterOptions.find ("Language");
-      if (it != end) set_option_macro ("n", args["n"], (*it).second, disp);
+    if (it != end) set_option_macro ("n", args["n"], (*it).second, disp);
+    if (it != end) set_option_macro ("n2", args["n2"], (*it).second, disp);
+
+    // _cq2selection_ (CombineQuery)
+    it = response.filterOptions.find ("CombineQuery");
+    if (it != end) set_option_macro ("cq2", args["cq2"], (*it).second, disp);
   }
 }