Ignore:
Timestamp:
07/22/11 20:24:23 (10 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:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/recpt/formattools.cpp

    r24226 r24306  
    622622 
    623623  // check for ex. which may occur in format statements
    624   if (meta.size()>3 && (substr(meta.begin(), meta.begin()+3) == "ex.")) {
     624  // remove "ex." prefix, but only if there are no other metadata set qualifiers
     625  // in the metaname, since we want to retain prefixes like "ex.dc." as-is
     626  text_t::iterator period = findchar(meta.begin(), meta.end(), '.');
     627  text_t::iterator lastperiod = findlastchar(meta.begin(), meta.end(), '.');
     628
     629  if (meta.size()>3 && (substr(meta.begin(), meta.begin()+3) == "ex.") && period == lastperiod) {
    625630    meta = substr (meta.begin()+3, meta.end());
    626631  }
     
    644649 
    645650  // check for ex. which may occur in format statements
    646   if (meta.size()>3 && (substr(meta.begin(), meta.begin()+3) == "ex.")) {
     651  // remove "ex." prefix, but only if there are no other metadata set qualifiers
     652  // in the metaname, since we want to retain prefixes like "ex.dc." as-is
     653  text_t::iterator period = findchar(meta.begin(), meta.end(), '.');
     654  text_t::iterator lastperiod = findlastchar(meta.begin(), meta.end(), '.');
     655
     656  if (meta.size()>3 && (substr(meta.begin(), meta.begin()+3) == "ex.") && period == lastperiod) {
    647657    meta = substr (meta.begin()+3, meta.end());
    648658  }
Note: See TracChangeset for help on using the changeset viewer.