Changeset 10873 for trunk/gsdl/src/recpt/documentaction.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/documentaction.cpp (modified) (13 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));
     }
   }