Changeset 24306 for main/trunk/greenstone2/runtime-src/src
- Timestamp:
- 2011-07-22T20:24:23+12:00 (13 years ago)
- Location:
- main/trunk/greenstone2/runtime-src/src/recpt
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/runtime-src/src/recpt/formattools.cpp
r24226 r24306 622 622 623 623 // 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) { 625 630 meta = substr (meta.begin()+3, meta.end()); 626 631 } … … 644 649 645 650 // 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) { 647 657 meta = substr (meta.begin()+3, meta.end()); 648 658 } -
main/trunk/greenstone2/runtime-src/src/recpt/querytools.cpp
r24111 r24306 989 989 if (!tag.empty()) { 990 990 991 if (tag.size()>3 && (substr(tag.begin(), tag.begin()+3) == "ex.")) { 991 // remove "ex." prefix, but only if there are no other metadata set qualifiers 992 // in the metaname, since we want to retain prefixes like "ex.dc." as-is 993 text_t::iterator period = findchar(tag.begin(), tag.end(), '.'); 994 text_t::iterator lastperiod = findlastchar(tag.begin(), tag.end(), '.'); 995 996 if (tag.size()>3 && (substr(tag.begin(), tag.begin()+3) == "ex.") && period == lastperiod) { 992 997 tag = substr (tag.begin()+3, tag.end()); 993 998 }
Note:
See TracChangeset
for help on using the changeset viewer.