Changeset 10873

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.

Location:

trunk/gsdl/src/recpt

Files:

• documentaction.cpp (modified) (13 diffs)
• hlistbrowserclass.cpp (modified) (1 diff)
• pageaction.cpp (modified) (16 diffs)
• queryaction.cpp (modified) (3 diffs)
• statusaction.cpp (modified) (2 diffs)
• vlistbrowserclass.cpp (modified) (8 diffs)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -380 +380 @@
 
    if (!use_pulldown) {
-      navigationbar += "<nobr>\n";
+
+      navigationbar += "_navtabsearch_";
       if (has_search_button) {
      if (args["a"] == "q") {
-        navigationbar += "_icontabsearchgreen_";
-     } else {
-        navigationbar += "_imagesearch_";
+        navigationbar += "(selected)";
      }
       }
   
-      if (has_search_button || numc == 0) navigationbar += "_imagespacer_";
+      if (has_search_button || numc == 0) navigationbar += "_navbarspacer_";
   
       bool first = true;
       while (dochere != docend) {
     date_extra = g_EmptyText;
-     if (!first) navigationbar += "_imagespacer_";
+     if (!first) navigationbar += "_navbarspacer_";
      
      text_t title = (*dochere).metadata["Title"].values[0];
@@ -402 +401 @@
          date_meta = "Date";
        }
-       date_extra = "&dm="+date_meta;
+       date_extra = "&amp;dm="+date_meta;
      }
      bool unknown = false;
      
-     // test the _XXXwidth_ macro to see if image macros are
-     // defined for this type of classification - if not we'll
-     // just display the text
+     // test if the _tabtext$FIELD_ macro is defined, which means
+     // this is a "known" metadata type and we have a translation for it
      text_t tmpwidth;
-     disp.expandstring ("document", "_" + title + "width_", tmpwidth);
-     if (tmpwidth == ("_" + title + "width_")) unknown = true;
+     text_t macroname="_tabtext" + title + "_";
+     disp.expandstring ("document", macroname, tmpwidth);
+     if (tmpwidth == macroname) // it wasn't expanded
+       unknown = true;
      
      // if we're inside a document all the classification buttons should be enabled
-     if (arg_d.empty() && ((*dochere).OID == topparent)) {
-        if (unknown) navigationbar += " " + title + " ";
-        else navigationbar += "_icontab" + title + "green_";
-     } else {
-        
-        // set the _httpbrowseXXX_ macro for this classification
-        if (unknown) navigationbar += " <a href=\"_httpdocument_&cl=" + 
-                (*dochere).OID + date_extra+"\">" + title + "</a> ";
-        else {
-           navigationbar += "_image" + title + "_";
-           disp.setmacro ("httpbrowse" + title, displayclass::defaultpackage, "_httpdocument_&cl=" + (*dochere).OID+date_extra);
-        }
+     text_t this_tab;
+     bool is_top;
+
+     is_top = ((*dochere).OID == topparent);
+
+     // set default text fragment
+     this_tab = "_navtab_(";
+
+     if (unknown) { // just give the field name
+       if (!is_top) {
+         // work out the link for this classifier, as it isn't the
+         // current page
+         this_tab += "_httpdocument_&amp;cl=" + (*dochere).OID
+           + date_extra;
+       }
+       this_tab += "," + title + ",";
+     } else { // use the macro for this field so we get translations
+       this_tab += "_httpbrowse" + title;
+       this_tab += "_,_tabtext" + title;
+       this_tab += "_,_textdescr" + title + "_";
      }
+
+     if (arg_d.empty() && is_top) {
+       // don't link to this classifier as it is the current one
+       this_tab += ",selected";
+     } else if (!unknown) {
+       // set the _httpbrowseXXX_ macro for this classification
+       // set the correct url for this link
+       disp.setmacro ("httpbrowse" + title, displayclass::defaultpackage, "_httpdocument_&amp;cl=" + (*dochere).OID+date_extra);
+     }
+
+     this_tab += ")";
+
+     navigationbar += this_tab;
+
      ++dochere;
      first = false;
       }
 
-      if (!has_search_button && numc == 1) navigationbar += "_imagespacer_";
-
-      navigationbar += "\n</nobr>\n";
-      navigationbar += "<!-- End of Navigation Bar -->\n";
+      if (!has_search_button && numc == 1) navigationbar += "_navbarspacer_";
+
+      navigationbar += "\n<!-- End of Navigation Bar -->\n";
 
    } else {
@@ -451 +472 @@
         navigationbar += " selected";
      }
-     navigationbar += ">_texticontabsearchgreen_</option>\n";
+     navigationbar += ">_tabtextsearch_</option>\n";
       }
 
@@ -461 +482 @@
          date_meta = "Date";
        }
-       date_extra = "&dm="+date_meta;
+       date_extra = "&amp;dm="+date_meta;
      }
 
-     navigationbar += "<option value=\"_httpdocument_&cl=" + dochere->OID +date_extra+ "\"";
+     navigationbar += "<option value=\"_httpdocument_&amp;cl=" + dochere->OID +date_extra+ "\"";
      if (topparent == dochere->OID) {
         navigationbar += " selected";
@@ -505 +526 @@
   // _httppagehome_      overridden home url if html collections have own homepage
 
-  // _usability_         a macro for remote usability reporting
 
   // must have a valid collection server to continue
@@ -549 +569 @@
       text_t httpdocument;
       disp.expandstring (displayclass::defaultpackage, "_httpdocument_", httpdocument);
-      httpdocument += "&f=1";
+      httpdocument += "&amp;f=1";
       disp.setmacro ("httpdocument", displayclass::defaultpackage, httpdocument);
       disp.setmacro ("gsdltop", displayclass::defaultpackage, "documenttop");
@@ -592 +612 @@
     }
   }
-  text_tmap::iterator usability = cinfo.format.find("Usability");
-  if(usability!=cinfo.format.end()){
-    disp.setmacro("usability",displayclass::defaultpackage,"_imageusab_");
-    disp.setmacro("usabinterface",displayclass::defaultpackage,("_usab"+(*usability).second+"_"));
-    disp.setmacro("usabilityscript", displayclass::defaultpackage, "_usabshowscript_");
-  }
 }
 
@@ -612 +626 @@
   if (get_info (inlink, args["c"], args["l"], metadata, false, collectproto, response, logout)) {
     if (!response.docInfo[0].metadata["section"].values[0].empty()) {
-      outlink = "_httpdocument_&d=" + response.docInfo[0].metadata["section"].values[0];
+      outlink = "_httpdocument_&amp;d=" + response.docInfo[0].metadata["section"].values[0];
       return true;
     }
@@ -635 +649 @@
       if (get_info (inlink, *col_here, args["l"], metadata, false, collectproto, response, logout)) {
     if (!response.docInfo[0].metadata["section"].values[0].empty()) {
-      outlink = "_httpdocument_&c=" + *col_here + "&d=" +
+      outlink = "_httpdocument_&amp;c=" + *col_here + "&amp;d=" +
         response.docInfo[0].metadata["section"].values[0];
       return true;
@@ -869 +883 @@
     bool unknown = false;
 
-    // test the _XXXwidth_ macro to see if image macros are
+    // test the _iconXXXpage_ macro to see if image macros are
     // defined for this type of classification - if not we'll
     // just display the text
     text_t tmp;
-    disp.expandstring ("document", "_" + title + "width_", tmp);
-    if (tmp == ("_" + title + "width_")) unknown = true;
+    text_t macroname="_icon" + title + "page_";
+    disp.expandstring ("document", macroname, tmp);
+    if (tmp == macroname) unknown = true; // it wasn't expanded
 
     if (unknown) {
@@ -1278 +1293 @@
   // work out values for next link
   if (haschildren) {
-    disp.setmacro ("httpnextarrow", "document", "_httpdocument_&cl=" + args["cl"] +
-           "&d=" + arg_d + ".fc");
+    disp.setmacro ("httpnextarrow", "document", "_httpdocument_&amp;cl=" + args["cl"] +
+           "&amp;d=" + arg_d + ".fc");
   } else {
     text_tarray::const_iterator h = next_siblings.begin();
@@ -1285 +1300 @@
     while (h != e) {
       if (!(*h).empty()) {
-    disp.setmacro ("httpnextarrow", "document", "_httpdocument_&cl=" + args["cl"] +
-               "&d=" + *h);
+    disp.setmacro ("httpnextarrow", "document", "_httpdocument_&amp;cl=" + args["cl"] +
+               "&amp;d=" + *h);
     break;
       }
@@ -1295 +1310 @@
   // work out value for previous link
   if (!previous_sibling.empty()) {
-    disp.setmacro ("httpprevarrow", "document", "_httpdocument_&cl=" + args["cl"] +
-           "&d=" + previous_sibling);
+    disp.setmacro ("httpprevarrow", "document", "_httpdocument_&amp;cl=" + args["cl"] +
+           "&amp;d=" + previous_sibling);
   } else {
     if (countchar(arg_d.begin(), arg_d.end(), '.')) {
-      disp.setmacro ("httpprevarrow", "document", "_httpdocument_&cl=" + args["cl"] +
-             "&d=" + get_parent(arg_d));
+      disp.setmacro ("httpprevarrow", "document", "_httpdocument_&amp;cl=" + args["cl"] +
+             "&amp;d=" + get_parent(arg_d));
     }
   }

trunk/gsdl/src/recpt/hlistbrowserclass.cpp

@@ -133 +133 @@
       link = "<a href=\"_httpdocument_";
       if (doctype == "classify") 
-    link += "&cl=" + (*tsibling).OID + "\">";
+    link += "&amp;cl=" + (*tsibling).OID + "\">";
       else {
-    link += "&cl=" + arg_cl + "&d=" + (*tsibling).OID;// + "\">";
+    link += "&amp;cl=" + arg_cl + "&amp;d=" + (*tsibling).OID;// + "\">";
     // [modification to allow default document detach settings -- kjdon]
     if (args["xx"]=="1") {
       // documents should be detached
-      link += "&x=1\" target=\\_blank>";
+      link += "&amp;x=1\" target=\\_blank>";
     } else {
       link += "\">";

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+"\">";

trunk/gsdl/src/recpt/queryaction.cpp

@@ -1363 +1363 @@
     text_t& arg_d = (*thissection).OID;
     text_t doc_url = "_httpdocument_";
-    doc_url += "&c=" + collection;
-    doc_url += "&d=" + arg_d;
+    doc_url += "&c=" + collection;
+    doc_url += "&d=" + arg_d;
 
     // location response (url may contain macros!!)
@@ -1375 +1375 @@
     text_t query_url = "_gwcgi_";
     query_url += "?e=" + args["e"];
-    query_url += "&h=" + args["h"];
-    query_url += "&q=" + args["q"];
-    query_url += "&r=" + args["r"];
-    query_url += "&t=" + args["t"];
-    query_url += "&hs=" + args["hs"];
+    query_url += "&h=" + args["h"];
+    query_url += "&q=" + args["q"];
+    query_url += "&r=" + args["r"];
+    query_url += "&t=" + args["t"];
+    query_url += "&hs=" + args["hs"];
 
     textout << outconvert << disp << "Location: " << query_url << "\n\n";
@@ -1600 +1600 @@
   }
   query += "c="+args["c"];
-  query += "&h="+args["h"];
-  query += "&t="+args["t"];
-  query += "&b="+args["b"];
-  query += "&j="+args["j"];
-  query += "&n="+args["n"];
-  query += "&s="+args["s"];
-  query += "&k="+args["k"];
-  query += "&g="+args["g"]; 
+  query += "&amp;h="+args["h"];
+  query += "&amp;t="+args["t"];
+  query += "&amp;b="+args["b"];
+  query += "&amp;j="+args["j"];
+  query += "&amp;n="+args["n"];
+  query += "&amp;s="+args["s"];
+  query += "&amp;k="+args["k"];
+  query += "&amp;g="+args["g"]; 
   
   text_t qstring = args["q"];
   //text_t formattedquery =cgi_safe(qstring);
-  //query += "&q="+formattedquery;
-  query += "&q="+qstring;
+  //query += "&amp;q="+formattedquery;
+  query += "&amp;q="+qstring;
   bool display=false;
   int hd = args.getintarg("hd");

trunk/gsdl/src/recpt/statusaction.cpp

@@ -61 +61 @@
       << "_status:infoheader_(_titlewelcome_)\n"
       << "_status:welcome_"
-      << "<center><table width=_pagewidth_>\n"
+      << "<table>\n"
       << "<th align=left>abbrev.</th><th align=left>collection</th>"
       << "<th align=left>public?</th><th align=left>running?</th></tr>\n";
@@ -127 +127 @@
   }
 
-  textout << "</table></center>\n";
+  textout << "</table>\n";
   textout << outconvert << disp << "_status:infofooter_\n";
 }

trunk/gsdl/src/recpt/vlistbrowserclass.cpp

@@ -74 +74 @@
 
   text_t collink = collection;
-  if (!collink.empty()) collink = "&c=" + collink;
+  if (!collink.empty()) collink = "&c=" + collink;
 
   get_link_icon (section, args, collink, link, icon);
@@ -124 +124 @@
 
   text_t collink = collection;
-  if (!collink.empty()) collink = "&c=" + collink;
+  if (!collink.empty()) collink = "&c=" + collink;
 
   if (colnumber > 0) {
@@ -209 +209 @@
   link = "<a href=\"_httpdocument_" + collink;
   text_t link_end = "\">";
-  text_t detach_link_end = "&x=1\" target=\\_blank>"; // to detach the link, and x=1 signifies it is a detached page
+  text_t detach_link_end = "&amp;x=1\" target=\\_blank>"; // to detach the link, and x=1 signifies it is a detached page
   icon = "_document:icontext_";
 
@@ -225 +225 @@
   if (args["a"] == "q") {
     // query results list
-    link += "&cl=search&d=" + section.OID;
+    link += "&amp;cl=search&amp;d=" + section.OID;
     
     if (args["xx"] == "1") {
@@ -243 +243 @@
     link = "<a href=\"_httpquery_\">";
       }
-      else link += "&cl=" + arg_cl + "\">";
+      else link += "&amp;cl=" + arg_cl + "\">";
       
     } else if (haschildren == 1) {
@@ -250 +250 @@
       (section.OID == arg_d)) {
     icon = "_document:iconopenfolder_";
-    link += "&cl=" + arg_cl + "&d=" + section.OID + ".pr\">";
+    link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID + ".pr\">";
       } else {
     icon = "_document:iconclosedfolder_";
-    link += "&cl=" + arg_cl + "&d=" + section.OID + "\">";
+    link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID + "\">";
       }
     } else {
       if (args["gt"] == "0") {
-    link += "&cl=" + arg_cl + "&d=" + section.OID + "\">";
+    link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID + "\">";
       } else {
-    link += "&cl=" + arg_cl + "&d=" + section.OID + "#" + section.OID + "\">";
+    link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID + "#" + section.OID + "\">";
       }
     }
@@ -271 +271 @@
         (section.OID == arg_cl)) {
       icon = "_document:iconopenbookshelf_";
-      link += "&cl=" + section.OID + ".pr\">";
+      link += "&amp;cl=" + section.OID + ".pr\">";
     } else {
       icon = "_document:iconclosedbookshelf_";
-      link += "&cl=" + section.OID + "\">";
+      link += "&amp;cl=" + section.OID + "\">";
     }
       } else {
     
     icon = "_document:iconclosedbook_";
-    link += "&cl=" + arg_cl + "&d=" + section.OID;
+    link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID;
     if (args["xx"] == "1") {
       link +=  detach_link_end;
@@ -290 +290 @@
       if (doctype == "classify") link = "";
       else {
-    link += "&cl=" + arg_cl + "&d=" + section.OID;
+    link += "&amp;cl=" + arg_cl + "&amp;d=" + section.OID;
     if (args["xx"] == "1") {
       link +=  detach_link_end;