Changeset 11986

Timestamp:

2006-06-30T16:03:47+12:00 (18 years ago)

Author:

kjdon

Message:

collection links on home page no longer need to set ct, qt, qto args as this is done for the pages they are needed

File:

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

trunk/gsdl/src/recpt/pageaction.cpp

@@ -38 +38 @@
 #include "fileutil.h"
 #include "gsdltools.h"
+#include "querytools.h"
 #include <time.h>
 
@@ -148 +149 @@
                    cgiargsclass &args, const recptconf &configinfo,
                    ostream &logout) {
-   
-   //text_t homeextra = "<center><table width=_pagewidth_><tr valign=top>\n";
-  //bool found_valid_col = false;
 
    text_t homeextra = "<form method=\"get\" name=\"browse\">\n";
@@ -177 +175 @@
         if (cinfo->isPublic && (cinfo->buildDate > 0)) {
 
-          text_t coll_type = "&amp;ct=";
-          if ((cinfo->buildType == "mgpp") || (cinfo->buildType == "lucene")) {
-
-        if (cinfo->buildType == "mgpp") {
-          coll_type += "1";
-        }
-        else {
-          coll_type += "2";
-        }
-
-        coll_type += "&amp;qto=";
-
-        // now we also want to check search types to set the qto arg 
-        if (cinfo->searchTypes.size() == 0) {
-          coll_type += "3"; // default to 3 (= both)
-        } else {
-          unsigned int search_types = 0;
-          text_tarray::const_iterator type_here = cinfo->searchTypes.begin();
-          text_tarray::const_iterator type_end = cinfo->searchTypes.end();
-          
-          while (type_here != type_end) {
-            if (*type_here == "form") {
-              search_types |= 2;
-            } else if (*type_here == "plain") {
-              search_types |= 1;
-            }
-            ++type_here;
-          }
-          coll_type += search_types;
-          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 += "&amp;qt=1"; // set the default to form
-            }
-          }
- 
-        }
-          }
-          else {
-        coll_type += "0";
-          }
           text_t collectionname = cinfo->get_collectionmeta("collectionname", args["l"]);
           if (collectionname.empty()) {
@@ -229 +185 @@
           if (!site_name.empty()) { optsite = "site="+site_name+"&amp;"; }
           
-          text_t link = "_gwcgi_?"+optsite+"a=p&amp;p=about&amp;c=" + *collist_here + coll_type;
+          text_t link = "_gwcgi_?"+optsite+"a=p&amp;p=about&amp;c=" + *collist_here;
           link += "&amp;l=" + args["l"] + "&amp;w=" + args["w"];
 
@@ -292 +248 @@
       if (cinfo != NULL) {
         if (cinfo->isPublic && (cinfo->buildDate > 0)) {
-
-          text_t coll_type = "&amp;ct=";
-          if ((cinfo->buildType == "mgpp") || (cinfo->buildType == "lucene")) {
-
-        if (cinfo->buildType == "mgpp") {
-          coll_type += "1";
-        }
-        else {
-          coll_type += "2";
-        }
-
-        coll_type += "&amp;qto=";
-
-        // now we also want to check search types to set the qto arg 
-        if (cinfo->searchTypes.size() == 0) {
-          coll_type += "3"; // default to 3 (= both)
-        } else {
-          unsigned int search_types = 0;
-          text_tarray::const_iterator type_here = cinfo->searchTypes.begin();
-          text_tarray::const_iterator type_end = cinfo->searchTypes.end();
-          
-          while (type_here != type_end) {
-            if (*type_here == "form") {
-              search_types |= 2;
-            } else if (*type_here == "plain") {
-              search_types |= 1;
-            }
-            ++type_here;
-          }
-          coll_type += search_types;
-          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 += "&amp;qt=1"; // set the default to form
-            }
-          }
- 
-        }
-          }
-          else {
-        coll_type += "0";
-          }
 
           found_valid_col = true;
@@ -382 +295 @@
           if (!site_name.empty()) { optsite = "site="+site_name+"&amp;"; }
 
-          text_t link = "<a href=\"_gwcgi_?"+optsite+"a=p&amp;p=about&amp;c=" + *collist_here + coll_type;
+          text_t link = "<a href=\"_gwcgi_?"+optsite+"a=p&amp;p=about&amp;c=" + *collist_here;
           link += "&amp;l=" + args["l"] + "&amp;w=" + args["w"] + "\">";
           
@@ -439 +352 @@
           ++count;
 
-          text_t coll_type = "&amp;ct=";
-
-          if ((cinfo->buildType == "mgpp") || (cinfo->buildType == "lucene")) {
-
-        if (cinfo->buildType == "mgpp") {
-          coll_type += "1";
-        }
-        else {
-          coll_type += "2";
-        }
-
-        coll_type += "&amp;qto=";
-
-        // now we also want to check search types to set the qto arg 
-        if (cinfo->searchTypes.size() == 0) {
-          coll_type += "3"; // default to 2 (= both)
-        } else {
-          int search_types = 0;
-          text_tarray::const_iterator type_here = cinfo->searchTypes.begin();
-          text_tarray::const_iterator type_end = cinfo->searchTypes.end();
-          
-          while (type_here != type_end) {
-            if (*type_here == "form") {
-              search_types |= 0x10;
-            } else if (*type_here == "plain") {
-              search_types |= 0x01;
-            }
-            ++type_here;
-          }
-          coll_type += search_types;
- 
-          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 += "&amp;qt=1"; // set the default to form
-            }
-          }
-        }
-          }
-          else {
-        coll_type += "0";
-          }
           text_t collectionname = cinfo->get_collectionmeta("collectionname", args["l"]);
           if (collectionname.empty()) {
@@ -492 +362 @@
           if (!site_name.empty()) { optsite = "site="+site_name+"&amp;"; }
 
-          text_t link = "<a href=\"_gwcgi_?"+optsite+"a=p&p=about&c=" + *collist_here + coll_type+"\">";
+          text_t link = "<a href=\"_gwcgi_?"+optsite+"a=p&p=about&c=" + *collist_here + "\">";
 
           if (!cinfo->receptionist.empty()) 
@@ -663 +533 @@
 }
 
+
 void pageaction::define_internal_macros (displayclass &disp, cgiargsclass &args, 
                      recptprotolistclass *protos, ostream &logout) {
@@ -762 +633 @@
     }
     disp.setmacro("numbytes", displayclass::defaultpackage, numbytes);
-  }
-
+
+    // set up ct, qt, qto
+    set_query_type_args(cinfo, args);
+
+  }
+  
   //setting _queryformcontent_ so that the query interface is consistent.
   //also adding usability button if necessary
@@ -998 +873 @@
       if (err != noError) issearchable = true;
       outconvertclass t;
-      if (!issearchable) {
+      if (!issearchable ) {
     disp.setmacro ("aboutqueryform", "about", "");
       }