Changeset 11771

Timestamp:

2006-05-04T16:05:00+12:00 (18 years ago)

Author:

kjdon

Message:

removed the dm arg from the date list classifier in navigation bar link. now we work it out when we are displaying a datelist

File:

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

trunk/gsdl/src/recpt/documentaction.cpp

@@ -373 +373 @@
    text_t navigationbar = "<!-- Navigation Bar -->\n";
 
-   text_t date_extra = g_EmptyText;
    get_top (args["cl"], topparent);
    int numc = response.docInfo.size();
@@ -391 +390 @@
       bool first = true;
       while (dochere != docend) {
-    date_extra = g_EmptyText;
      if (!first) navigationbar += "_navbarspacer_";
      
-     // are we a datelist?? - need to set dm arg
-     text_t childtype = (*dochere).metadata["childtype"].values[0];
-     if (childtype == "DateList") { 
-       text_t date_meta = (*dochere).metadata["mdtype"].values[0];
-       if (date_meta == g_EmptyText) {
-         date_meta = "Date";
-       }
-       date_extra = "&amp;dm="+date_meta;
-     }
      bool unknown = false;
      
@@ -426 +415 @@
          // 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 += "_httpdocument_&amp;cl=" + (*dochere).OID;
        }
        this_tab += "," + title + "," + title;
@@ -443 +431 @@
      // 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);
+     disp.setmacro ("httpbrowse" + title, displayclass::defaultpackage, "_httpdocument_&amp;cl=" + (*dochere).OID);
      
 
@@ -478 +466 @@
       while (dochere != docend) {
      text_t title = dochere->metadata["Title"].values[0];    
-     if (title == "Date") { // a date list
-       text_t date_meta = (*dochere).metadata["mdtype"].values[0];
-       if (date_meta == "") {
-         date_meta = "Date";
-       }
-       date_extra = "&amp;dm="+date_meta;
-     }
-
-     navigationbar += "<option value=\"_httpdocument_&amp;cl=" + dochere->OID +date_extra+ "\"";
+
+     navigationbar += "<option value=\"_httpdocument_&amp;cl=" + dochere->OID + "\"";
      if (topparent == dochere->OID) {
         navigationbar += " selected";
@@ -595 +576 @@
     
     metadata.insert ("Title");
-    metadata.insert ("mdtype"); // in case there is a datelist
-    metadata.insert ("childtype"); // in case there is a datelist
     bool getParents = false;
     get_children ("", collection, args["l"], metadata, getParents, collectproto, response, logout);