Changeset 6645 for trunk/gsdl/src

Timestamp:

2004-01-28T15:10:55+13:00 (20 years ago)

Author:

kjdon

Message:

modified the datelist display so that it can use other metadata eg dc.Date not just Date. The classifier itself had been modified a while ago to take a datemeta argument, and then build the classifier on that metadata rather than assuming Date. It now adds a mdtype value into the top level classifier node, which contains the name of the date metadata. The documentaction when making the nav bar macros looks for mdtype if it comes across a datelist, and sets the dm arg for that classifier button. datelist browser now looks for the dm arg and uses that metadata to create the special years and months bit down the side. Formattools is also modified. It used to modify the Date metadata to display it as xx month YYYY - now it does that for any metadata that ends in .Date - ignores namespaces

Location:

trunk/gsdl/src/recpt

Files:

• datelistbrowserclass.cpp (modified) (1 diff)
• documentaction.cpp (modified) (6 diffs)
• formattools.cpp (modified) (7 diffs)
• formattools.h (modified) (1 diff)

trunk/gsdl/src/recpt/datelistbrowserclass.cpp

@@ -82 +82 @@
   ResultDocInfo_tarray::iterator thissection = sections.docInfo.begin();
   ResultDocInfo_tarray::iterator endsection = sections.docInfo.end();
-
+  
+  // use the dm arg as date metadata or else Date
+  text_t date_meta = args["dm"];
+  if (date_meta == "") {
+    date_meta = "Date";
+  }
   while (thissection != endsection) {
 
     text_t &doctype = (*thissection).metadata["doctype"].values[0];
-    text_t &date = (*thissection).metadata["Date"].values[0]; 
+    text_t &date = (*thissection).metadata[date_meta].values[0]; 
 
     // bail on this document if it has no date

trunk/gsdl/src/recpt/documentaction.cpp

@@ -167 +167 @@
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "0";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  //dm is the metadata that has been used for the datelist
+  arg_ainfo.shortname = "dm";
+  arg_ainfo.longname = "date metadata";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
   arg_ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -362 +371 @@
    text_t navigationbar = "<!-- Navigation Bar -->\n";
 
+   text_t date_extra = "";
    get_top (args["cl"], topparent);
    int numc = response.docInfo.size();
@@ -381 +391 @@
       bool first = true;
       while (dochere != docend) {
-     
+    date_extra = "";
      if (!first) navigationbar += "_imagespacer_";
      
      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 = "&dm="+date_meta;
+     }
      bool unknown = false;
      
@@ -403 +419 @@
         // set the _httpbrowseXXX_ macro for this classification
         if (unknown) navigationbar += " <a href=\"_httpdocument_&cl=" + 
-                (*dochere).OID + "\">" + title + "</a> ";
+                (*dochere).OID + date_extra+"\">" + title + "</a> ";
         else {
            navigationbar += "_image" + title + "_";
-           disp.setmacro ("httpbrowse" + title, "Global", "_httpdocument_&cl=" + (*dochere).OID);
+           disp.setmacro ("httpbrowse" + title, "Global", "_httpdocument_&cl=" + (*dochere).OID+date_extra);
         }
      }
@@ -438 +454 @@
       while (dochere != docend) {
      text_t title = dochere->metadata["Title"].values[0];    
-     navigationbar += "<option value=\"_httpdocument_&cl=" + dochere->OID + "\"";
+     if (title == "Date") { // a date list
+       text_t date_meta = (*dochere).metadata["mdtype"].values[0];
+       if (date_meta == "") {
+         date_meta = "Date";
+       }
+       date_extra = "&dm="+date_meta;
+     }
+
+     navigationbar += "<option value=\"_httpdocument_&cl=" + dochere->OID +date_extra+ "\"";
      if (topparent == dochere->OID) {
         navigationbar += " selected";
@@ -545 +569 @@
     
     metadata.insert ("Title");
+    metadata.insert ("mdtype"); // in case there is a datelist
     bool getParents = false;
     get_children ("", collection, metadata, getParents, collectproto, response, logout);

trunk/gsdl/src/recpt/formattools.cpp

@@ -154 +154 @@
 
 
+text_t remove_namespace(const text_t &meta_name) {
+  text_t::const_iterator end = meta_name.end();
+  text_t::const_iterator it = findchar(meta_name.begin(), end, '.');
+  if (it != end) {
+    return substr(it+1, end);
+  }
+  return meta_name;
+
+}
 // returns a date of form 31 _textmonthnn_ 1999 
 // input is date of type 19991231
@@ -858 +867 @@
 
   MetadataInfo_t *parent = docinfo.metadata[meta.metaname].parent;
-
+  text_t no_ns_metaname = remove_namespace(meta.metaname);
   switch (meta.parentcommand) {
   case pNone:
@@ -873 +882 @@
     for (int i=start_i; i<=end_i; i++) {
       if (!first) tmp += meta.functionoptions;
-      if (meta.metaname == "Date") tmp += format_date (metaname_rec.values[i]);
-      else if (meta.metaname == "Language") tmp += iso639(metaname_rec.values[i]);
+      
+      if (no_ns_metaname == "Date") tmp += format_date (metaname_rec.values[i]);
+      else if (no_ns_metaname == "Language") tmp += iso639(metaname_rec.values[i]);
       else tmp += metaname_rec.values[i];
       first = false;
@@ -890 +900 @@
     text_t metadata_item = docinfo.metadata[meta.metaname].values[metaname_index];
     
-    if (meta.metaname == "Date")
+    if (no_ns_metaname == "Date")
       return format_date (metadata_item);
-    else if (meta.metaname == "Language")
+    else if (no_ns_metaname == "Language")
       return iso639(metadata_item);
     if (meta.metacommand & mCgiSafe) 
@@ -902 +912 @@
   case pImmediate:
     if (parent != NULL) {
-      if (meta.metaname == "Date") 
+      if (no_ns_metaname == "Date") 
     return format_date (parent->values[0]);
       if (meta.metacommand & mCgiSafe) 
@@ -914 +924 @@
       while (parent->parent != NULL) parent = parent->parent;
 
-      if (meta.metaname == "Date") 
+      if (no_ns_metaname == "Date") 
     return format_date (parent->values[0]);
       if (meta.metacommand & mCgiSafe) 
@@ -936 +946 @@
       while (here != end) {
     if (!first) tmp += meta.functionoptions;
-    if (meta.metaname == "Date") tmp += format_date (*here);
+    if (no_ns_metaname == "Date") tmp += format_date (*here);
     else tmp += *here;
     first = false;

trunk/gsdl/src/recpt/formattools.h

@@ -110 +110 @@
 text_t format_date (const text_t &date);
 
+text_t remove_namespace(const text_t &meta_name);
+
 text_t iso639 (const text_t &langcode);