Changeset 10873 for trunk/gsdl/src/recpt/pageaction.cpp

Timestamp:

2005-11-08T17:30:57+13:00 (18 years ago)

Author:

jrm21

Message:

documentaction modified for new HTML4/CSS stuff (eg stop looking for
icon width macros). Other files modified to tidy up output (put tag
attribute values in quotes, use & instead of &, etc). Not quite
finished yet but it works.

File:

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

trunk/gsdl/src/recpt/pageaction.cpp

@@ -177 +177 @@
         if (cinfo->isPublic && (cinfo->buildDate > 0)) {
 
-          text_t coll_type = "&ct=";
+          text_t coll_type = "&ct=";
           if ((cinfo->buildType == "mgpp") || (cinfo->buildType == "lucene")) {
 
@@ -187 +187 @@
         }
 
-        coll_type += "&qto=";
+        coll_type += "&qto=";
 
         // now we also want to check search types to set the qto arg 
@@ -210 +210 @@
             type_here = cinfo->searchTypes.begin();
             if (*type_here == "form") { 
-              coll_type += "&qt=1"; // set the default to form
+              coll_type += "&qt=1"; // set the default to form
             }
           }
@@ -227 +227 @@
           text_t optsite = g_EmptyText;
           text_t site_name = (*rprotolist_here).p->get_site_name (err);
-          if (!site_name.empty()) { optsite = "site="+site_name+"&"; }
-          
-          text_t link = "_gwcgi_?"+optsite+"a=p&p=about&c=" + *collist_here + coll_type;
-          link += "&l=" + args["l"] + "&w=" + args["w"];
+          if (!site_name.empty()) { optsite = "site="+site_name+"&"; }
+          
+          text_t link = "_gwcgi_?"+optsite+"a=p&p=about&c=" + *collist_here + coll_type;
+          link += "&l=" + args["l"] + "&w=" + args["w"];
 
           // We are "dynamically" overriding so to speak the
@@ -271 +271 @@
                  ostream &logout) {
   
-  text_t homeextra = "<center><table width=_pagewidth_><tr valign=top>\n";
+  text_t homeextra = "<table class=\"collections\"><tr valign=\"top\">\n";
   bool found_valid_col = false;
   recptprotolistclass::iterator rprotolist_here = protos->begin();
@@ -293 +293 @@
         if (cinfo->isPublic && (cinfo->buildDate > 0)) {
 
-          text_t coll_type = "&ct=";
+          text_t coll_type = "&amp;ct=";
           if ((cinfo->buildType == "mgpp") || (cinfo->buildType == "lucene")) {
 
@@ -303 +303 @@
         }
 
-        coll_type += "&qto=";
+        coll_type += "&amp;qto=";
 
         // now we also want to check search types to set the qto arg 
@@ -326 +326 @@
             type_here = cinfo->searchTypes.begin();
             if (*type_here == "form") { 
-              coll_type += "&qt=1"; // set the default to form
+              coll_type += "&amp;qt=1"; // set the default to form
             }
           }
@@ -369 +369 @@
         
         collectionname 
-          = "<img width=150 border=1 src=\"" + iconurl + "\" alt=\"" + alt + "\">";
+          = "<img width=\"150\" border=\"1\" src=\"" + iconurl + "\" alt=\"" + alt + "\">";
           } else {
         collectionname = alt;
@@ -375 +375 @@
           
           if ((count%configinfo.HomePageCols == 0) && (!first))
-        homeextra += "</tr><tr valign=top>\n";
+        homeextra += "</tr><tr valign=\"top\">\n";
           
           comerror_t err;
           text_t optsite = g_EmptyText;
           text_t site_name = (*rprotolist_here).p->get_site_name (err);
-          if (!site_name.empty()) { optsite = "site="+site_name+"&"; }
-
-          text_t link = "<a href=\"_gwcgi_?"+optsite+"a=p&p=about&c=" + *collist_here + coll_type;
-          link += "&l=" + args["l"] + "&w=" + args["w"] + "\">";
+          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;
+          link += "&amp;l=" + args["l"] + "&amp;w=" + args["w"] + "\">";
           
           if (!cinfo->receptionist.empty()) 
@@ -400 +400 @@
       }
     }
-    homeextra += "</td></tr>\n<tr>\n";
+    homeextra += "</tr>\n<tr>\n";
     ++rprotolist_here;
   }
@@ -407 +407 @@
     homeextra += "<td>No valid (i.e. built and public) collections are available</td>\n";
   }
-  homeextra += "</tr></table></center>\n";
+  homeextra += "</tr></table>\n";
   disp.setmacro ("homeextra", "home", homeextra); 
 }
@@ -439 +439 @@
           ++count;
 
-          text_t coll_type = "&ct=";
+          text_t coll_type = "&amp;ct=";
 
           if ((cinfo->buildType == "mgpp") || (cinfo->buildType == "lucene")) {
@@ -450 +450 @@
         }
 
-        coll_type += "&qto=";
+        coll_type += "&amp;qto=";
 
         // now we also want to check search types to set the qto arg 
@@ -474 +474 @@
             type_here = cinfo->searchTypes.begin();
             if (*type_here == "form") { 
-              coll_type += "&qt=1"; // set the default to form
+              coll_type += "&amp;qt=1"; // set the default to form
             }
           }
@@ -490 +490 @@
           text_t optsite = g_EmptyText;
           text_t site_name = (*rprotolist_here).p->get_site_name (err);
-          if (!site_name.empty()) { optsite = "site="+site_name+"&"; }
+          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+"\">";