Changeset 12174 for trunk/gsdl/src/recpt/documentaction.cpp

Timestamp:

2006-07-12T16:11:15+12:00 (18 years ago)

Author:

kjdon

Message:

changed the way navigation bar is made. no longer test on tabtextXXX. Just output the same thing whatever case. The macro files will work out what to output

File:

• trunk/gsdl/src/recpt/documentaction.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -380 +380 @@
    if (!use_pulldown) {
       if (has_search_button) {
+    // search uses its own navtab, as it may be suppressed based on args
     navigationbar += "_navtabsearch_";
-     if (args["a"] == "q") {
-        navigationbar += "(selected)";
-     }
-      }
-  
+    if (args["a"] == "q") {
+      navigationbar += "(selected)";
+    }
+      }
+      
       if (has_search_button || numc == 0) navigationbar += "_navbarspacer_";
-  
+      
       bool first = true;
       while (dochere != docend) {
-     if (!first) navigationbar += "_navbarspacer_";
-     
-     bool unknown = false;
-     
-     // 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 title = (*dochere).metadata["Title"].values[0];
-     text_t tmpwidth;
-     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
-     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 (!arg_d.empty() || !is_top) {
-         // work out the link for this classifier, as it isn't the
-         // current page
-         this_tab += "_httpdocument_&cl=" + (*dochere).OID;
-       }
-       this_tab += "," + title + "," + 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 (!first) navigationbar += "_navbarspacer_";
+    
+    text_t title = (*dochere).metadata["Title"].values[0];
+    
+    navigationbar += "_navtab_(_httpbrowse"+title+"_,"+title;
+    // if we are at this classifier
+    if (arg_d.empty() && ((*dochere).OID == topparent)) {
+       // don't link to this classifier as it is the current one
+       navigationbar += ",selected";
      }
-
-     if (arg_d.empty() && is_top) {
-       // don't link to this classifier as it is the current one
-       this_tab += ",selected";
-     }
-
-     // set the _httpbrowseXXX_ macro for this classification
-     // set the correct url for this link
-     disp.setmacro ("httpbrowse" + title, displayclass::defaultpackage, "_httpdocument_&cl=" + (*dochere).OID);
-     
-
-     this_tab += ")";
-
-     navigationbar += this_tab;
-
+     navigationbar += ")";
+
+    // set the _httpbrowseXXX_ macro for this classification
+    // set the correct url for this link
+    disp.setmacro ("httpbrowse" + title, displayclass::defaultpackage, "_httpdocument_&cl=" + (*dochere).OID);
      ++dochere;
      first = false;
       }
-
-      //if (!has_search_button && numc == 1) navigationbar += "_navbarspacer_";
-
+      
       navigationbar += "\n<!-- End of Navigation Bar -->\n";
 
@@ -471 +437 @@
         navigationbar += " selected";
      }
-     navigationbar += ">" + title + "</option>\n";
+     navigationbar += ">_navlinktitle_(" + title + ")</option>\n";
      ++dochere;
       }