Changeset 12229

Timestamp:

2006-07-14T13:15:57+12:00 (18 years ago)

Author:

kjdon

Message:

set_navbarmacros now uses httpbrowseCL1 etc rather than httpbrowseTitle etc. This means it will work for classifiers where the title is not in latin characters, and also if you have two classifiers of the same name, they won't get confused

File:

• trunk/gsdl/src/recpt/documentaction.cpp (modified) (3 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
+    // search uses its own navtab, as it may be suppressed based on other args
     navigationbar += "_navtabsearch_";
     if (args["a"] == "q") {
@@ -395 +395 @@
     text_t title = (*dochere).metadata["Title"].values[0];
     
-    navigationbar += "_navtab_(_httpbrowse"+title+"_,"+title;
+    navigationbar += "_navtab_(_httpbrowse"+(*dochere).OID+"_,"+title;
     // if we are at this classifier
     if (arg_d.empty() && ((*dochere).OID == topparent)) {
@@ -403 +403 @@
      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);
+    // set the _httpbrowseCLX_ macro for this classification
+    disp.setmacro ("httpbrowse" + (*dochere).OID, displayclass::defaultpackage, "_httpdocument_&cl=" + (*dochere).OID);
      ++dochere;
      first = false;