Changeset 24306 for main/trunk/greenstone2/runtime-src/src/recpt/formattools.cpp

Timestamp:

2011-07-22T20:24:23+12:00 (13 years ago)

Author:

ak19

Message:

More changes to do with the ex. prefixed to embedded metadata (that may have an additional metadata set as namespace qualifier). The C code now removes the ex. prefix only if there are no other metadataset qualifiers in the metadata name.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/formattools.cpp (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/formattools.cpp

@@ -622 +622 @@
   
   // check for ex. which may occur in format statements
-  if (meta.size()>3 && (substr(meta.begin(), meta.begin()+3) == "ex.")) {
+  // remove "ex." prefix, but only if there are no other metadata set qualifiers 
+  // in the metaname, since we want to retain prefixes like "ex.dc." as-is
+  text_t::iterator period = findchar(meta.begin(), meta.end(), '.');
+  text_t::iterator lastperiod = findlastchar(meta.begin(), meta.end(), '.');
+
+  if (meta.size()>3 && (substr(meta.begin(), meta.begin()+3) == "ex.") && period == lastperiod) {
     meta = substr (meta.begin()+3, meta.end());
   }
@@ -644 +649 @@
   
   // check for ex. which may occur in format statements
-  if (meta.size()>3 && (substr(meta.begin(), meta.begin()+3) == "ex.")) {
+  // remove "ex." prefix, but only if there are no other metadata set qualifiers 
+  // in the metaname, since we want to retain prefixes like "ex.dc." as-is
+  text_t::iterator period = findchar(meta.begin(), meta.end(), '.');
+  text_t::iterator lastperiod = findlastchar(meta.begin(), meta.end(), '.');
+
+  if (meta.size()>3 && (substr(meta.begin(), meta.begin()+3) == "ex.") && period == lastperiod) {
     meta = substr (meta.begin()+3, meta.end());
   }