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

Timestamp:

2010-08-17T16:33:13+12:00 (14 years ago)

Author:

mdewsnip

Message:

Added new "dmsafe:" format statement modifier, in preparation for removing dmsafe() calls from the build time code. This shouldn't be done in the build time code because it is a runtime issue -- if you aren't using the Greenstone 2 receptionist (e.g OAI server, Greenstone 3) then escaping underscores just creates problems.

File:

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

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

@@ -26 +26 @@
 #include "formattools.h"
 #include "cgiutils.h"
+#include "gsdltools.h"
 #include "recptprototools.h"
 #include "OIDtools.h"
@@ -548 +549 @@
       keep_trying = true;
     }
+    // New "dmsafe" special formatting option
+    if (meta.size() > ((text_t) "dmsafe:").size() && starts_with(meta, "dmsafe:"))
+    {
+      metaoption.metacommand |= mDMSafe;
+      meta = substr(meta.begin() + ((text_t) "dmsafe:").size(), meta.end());
+      keep_trying = true;
+    }
   }
 
@@ -1076 +1084 @@
     fresh_metatext = text_html_safe;
       }
+      // New "dmsafe" special formatting option
+      if (meta.metacommand & mDMSafe)
+      {
+    // Make it macro-safe
+    text_t text_dm_safe = dm_safe(fresh_metatext);
+    fresh_metatext = text_dm_safe;
+      }
 
       if (metadata_spanwrap) {
@@ -1145 +1160 @@
       }
       fresh_metatext = text_html_safe;
+    }
+    // New "dmsafe" special formatting option
+    if (meta.metacommand & mDMSafe)
+    {
+      // Make it macro-safe
+      text_t text_dm_safe = dm_safe(fresh_metatext);
+      fresh_metatext = text_dm_safe;
     }