Changeset 4770

Timestamp:

2003-06-23T15:20:01+12:00 (21 years ago)

Author:

kjdon

Message:

removed some stuff which wasn't supposed to be there, and made the default search type (ie whether the search page first shows plain or form) the first one in the list of search types

File:

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

trunk/gsdl/src/recpt/pageaction.cpp

@@ -138 +138 @@
         } else {
           unsigned int search_types = 0;
-          cout << "search_types = "<<search_types <<endl;
           text_tarray::const_iterator type_here = cinfo->searchTypes.begin();
           text_tarray::const_iterator type_end = cinfo->searchTypes.end();
@@ -151 +150 @@
           }
           coll_type += search_types;
-          cout << "new search_types = "<<search_types <<endl;
+          if (search_types == 3) {
+            // both were specified, now need to look at the order to see which is the default
+            type_here = cinfo->searchTypes.begin();
+            if (*type_here == "form") { 
+              coll_type += "&qt=1"; // set the default to form
+            }
+          }
  
         }
@@ -282 +287 @@
         } else {
           int search_types = 0;
-          cout << "search_types = "<<search_types <<endl;
           text_tarray::const_iterator type_here = cinfo->searchTypes.begin();
           text_tarray::const_iterator type_end = cinfo->searchTypes.end();
@@ -295 +299 @@
           }
           coll_type += search_types;
-          cout << "new search_types = "<<search_types <<endl;
  
+          if (search_types == 3) {
+            // both were specified, now need to look at the order to see which is the default
+            type_here = cinfo->searchTypes.begin();
+            if (*type_here == "form") { 
+              coll_type += "&qt=1"; // set the default to form
+            }
+          }
         }
           }