Changeset 22650 for main/trunk/greenstone2/runtime-src/src
- Timestamp:
- 2010-08-17T16:33:13+12:00 (14 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
r22437 r22650 26 26 #include "formattools.h" 27 27 #include "cgiutils.h" 28 #include "gsdltools.h" 28 29 #include "recptprototools.h" 29 30 #include "OIDtools.h" … … 548 549 keep_trying = true; 549 550 } 551 // New "dmsafe" special formatting option 552 if (meta.size() > ((text_t) "dmsafe:").size() && starts_with(meta, "dmsafe:")) 553 { 554 metaoption.metacommand |= mDMSafe; 555 meta = substr(meta.begin() + ((text_t) "dmsafe:").size(), meta.end()); 556 keep_trying = true; 557 } 550 558 } 551 559 … … 1076 1084 fresh_metatext = text_html_safe; 1077 1085 } 1086 // New "dmsafe" special formatting option 1087 if (meta.metacommand & mDMSafe) 1088 { 1089 // Make it macro-safe 1090 text_t text_dm_safe = dm_safe(fresh_metatext); 1091 fresh_metatext = text_dm_safe; 1092 } 1078 1093 1079 1094 if (metadata_spanwrap) { … … 1145 1160 } 1146 1161 fresh_metatext = text_html_safe; 1162 } 1163 // New "dmsafe" special formatting option 1164 if (meta.metacommand & mDMSafe) 1165 { 1166 // Make it macro-safe 1167 text_t text_dm_safe = dm_safe(fresh_metatext); 1168 fresh_metatext = text_dm_safe; 1147 1169 } 1148 1170 -
main/trunk/greenstone2/runtime-src/src/recpt/formattools.h
r21808 r22650 41 41 comAssocLink, comEndAssocLink}; 42 42 43 enum mcommand_t {mNone=0, mCgiSafe=1, mParent=2, mSibling=4, mChild=8, mSpecial=16, mTruncate=32, mXMLSafe=64, mHTMLSafe=128 };43 enum mcommand_t {mNone=0, mCgiSafe=1, mParent=2, mSibling=4, mChild=8, mSpecial=16, mTruncate=32, mXMLSafe=64, mHTMLSafe=128, mDMSafe=256}; 44 44 45 45 enum pcommand_t {pNone, pImmediate, pTop, pAll};
Note:
See TracChangeset
for help on using the changeset viewer.