Changeset 24306 for main/trunk/greenstone2/runtime-src/src/recpt/querytools.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/querytools.cpp (modified) (1 diff)

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

@@ -989 +989 @@
     if (!tag.empty()) {
 
-      if (tag.size()>3 && (substr(tag.begin(), tag.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(tag.begin(), tag.end(), '.');
+      text_t::iterator lastperiod = findlastchar(tag.begin(), tag.end(), '.');
+
+      if (tag.size()>3 && (substr(tag.begin(), tag.begin()+3) == "ex.") && period == lastperiod) {
     tag = substr (tag.begin()+3, tag.end());
       }