Changeset 6645 for trunk/gsdl/src/recpt/formattools.cpp

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

File:

• trunk/gsdl/src/recpt/formattools.cpp (modified) (7 diffs)

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;