Changeset 19298 for gsdl

Timestamp:

2009-04-30T14:04:59+12:00 (15 years ago)

Author:

davidb

Message:

optional support for metadata wrapped in span tags added. *OFF* by default.

File:

• gsdl/trunk/runtime-src/src/recpt/formattools.cpp (modified) (5 diffs)

gsdl/trunk/runtime-src/src/recpt/formattools.cpp

@@ -31 +31 @@
 
 #include <assert.h>
+
+bool spanwrap = false;
 
 // a few function prototypes
@@ -881 +883 @@
 {
   text_t no_ns_metaname = remove_namespace(meta.metaname);
-  text_t tmp;
+  text_t formatted_metatext;
   bool first = true;
   
@@ -889 +891 @@
   if (position == -1) { // all
     for (int i=start_i; i<=end_i; ++i) {
-      if (!first) tmp += meta.siblingoptions;
+      if (!first) formatted_metatext += meta.siblingoptions;
+      
+      text_t fresh_metatext;
+
       if (meta.metacommand & mSpecial) {
     // special formatting
-    if (no_ns_metaname == "Date") tmp += format_date (metainfo.values[i]);
-    else if (no_ns_metaname == "Language") tmp += iso639(metainfo.values[i]);
-    else tmp += "_format:"+meta.metaname+"_("+metainfo.values[i]+")";
+    if (no_ns_metaname == "Date") fresh_metatext = format_date (metainfo.values[i]);
+    else if (no_ns_metaname == "Language") fresh_metatext = iso639(metainfo.values[i]);
+    else fresh_metatext = "_format:"+meta.metaname+"_("+metainfo.values[i]+")";
       }
-      else tmp += metainfo.values[i];
+      else fresh_metatext = metainfo.values[i];
+
+      if (spanwrap) {
+    fresh_metatext = "<span metaname=\"" + meta.metaname + "\" metapos=\"" + i + "\">" + fresh_metatext + "</span>";
+      }
+      formatted_metatext += fresh_metatext;
+
       first = false;
       
@@ -906 +917 @@
       return "";
     }
+
+    text_t fresh_metatext;
     if (meta.metacommand & mSpecial) {
+
       // special formatting
-      if (no_ns_metaname == "Date") tmp += format_date (metainfo.values[position]);
-      else if (no_ns_metaname == "Language") tmp += iso639(metainfo.values[position]);
-      else tmp += "_format:"+meta.metaname+"_("+metainfo.values[position]+")";
+      if (no_ns_metaname == "Date") fresh_metatext = format_date (metainfo.values[position]);
+      else if (no_ns_metaname == "Language") fresh_metatext = iso639(metainfo.values[position]);
+      else fresh_metatext = "_format:"+meta.metaname+"_("+metainfo.values[position]+")";
     } 
-    else tmp += metainfo.values[position];
-  }
-  if (meta.metacommand & mCgiSafe && !no_cgisafe) return cgi_safe_unicode (tmp);
-  else return tmp;
+    else fresh_metatext = metainfo.values[position];
+
+    if (spanwrap) {
+      fresh_metatext = "<span metaname=\"" + meta.metaname + "\" metapos=\"" + position + "\">" + fresh_metatext + "</span>";
+    }
+
+    formatted_metatext += fresh_metatext;
+  }
+
+  if (meta.metacommand & mCgiSafe && !no_cgisafe) return cgi_safe_unicode (formatted_metatext);
+  else return formatted_metatext;
 }
 
@@ -1365 +1386 @@
   // to see whether we output the "then" or the "else" clause
   if (decision.command == dMeta) {
-    if (get_meta (collection,collectproto,docinfo,disp,decision.meta,options,
-          logout) != "") {
+
+    bool store_spanwrap = spanwrap;
+    spanwrap = 0;
+
+    // temporarily suspend spanwrap (if on) so can test if metadata item really exits or not
+    bool metadata_exists 
+      = (get_meta (collection,collectproto,docinfo,disp,decision.meta,options,
+           logout) != "");
+
+    spanwrap = store_spanwrap;
+
+    if (metadata_exists) {
       if (ifptr != NULL)
     return get_formatted_string (collection,collectproto,docinfo, disp, ifptr,