Changeset 19302 for gsdl

Timestamp:

2009-05-01T09:48:50+12:00 (15 years ago)

Author:

davidb

Message:

Introduction of [metadata-spanwrap] ... metadata-spanwrap to mark zones where the addition of span tags is required.

Location:

gsdl/trunk/runtime-src/src/recpt

Files:

• formattools.cpp (modified) (7 diffs)
• formattools.h (modified) (1 diff)

gsdl/trunk/runtime-src/src/recpt/formattools.cpp

@@ -32 +32 @@
 #include <assert.h>
 
-bool spanwrap = false;
+static bool metadata_spanwrap = false;
 
 // a few function prototypes
@@ -583 +583 @@
     formatlistptr->command = comEndHighlight;
 
+  else if (meta == "metadata-spanwrap")
+    formatlistptr->command = comMetadataSpanWrap;
+
+  else if (meta == "/metadata-spanwrap")
+    formatlistptr->command = comEndMetadataSpanWrap;
+
   else if (meta == "Summary")
     formatlistptr->command = comSummary;
@@ -903 +909 @@
       else fresh_metatext = metainfo.values[i];
 
-      if (spanwrap) {
+      if (metadata_spanwrap) {
     fresh_metatext = "<span metaname=\"" + meta.metaname + "\" metapos=\"" + i + "\">" + fresh_metatext + "</span>";
       }
@@ -928 +934 @@
     else fresh_metatext = metainfo.values[position];
 
-    if (spanwrap) {
+    if (metadata_spanwrap) {
       fresh_metatext = "<span metaname=\"" + meta.metaname + "\" metapos=\"" + position + "\">" + fresh_metatext + "</span>";
     }
@@ -1125 +1131 @@
               ostream& logout) {
 
-  text_t tmp;
   while (orptr != NULL) {
 
-    tmp = format_string (collection,collectproto,docinfo, disp, orptr, 
-             options, logout);
-    if (!tmp.empty()) return tmp;
+    if (metadata_spanwrap) {
+      // need to be a bit more careful about this
+      // => test for it *without* spanwrap, and if defined, then
+      // got back and generate it again, this time with spanwrap on
+
+      metadata_spanwrap = false;
+      text_t test_tmp = format_string (collection,collectproto,docinfo, disp, orptr, 
+                       options, logout);
+      metadata_spanwrap = true;
+      if (!test_tmp.empty()) {
+
+    return format_string (collection,collectproto,docinfo, disp, orptr, 
+                  options, logout);
+      }
+    }
+    else {
+      text_t tmp = format_string (collection,collectproto,docinfo, disp, orptr, 
+                  options, logout);
+      if (!tmp.empty()) return tmp;
+    }
 
     orptr = orptr->nextptr;
@@ -1387 +1409 @@
   if (decision.command == dMeta) {
 
-    bool store_spanwrap = spanwrap;
-    spanwrap = 0;
-
-    // temporarily suspend spanwrap (if on) so can test if metadata item really exits or not
+    bool store_metadata_spanwrap = metadata_spanwrap;
+    metadata_spanwrap = 0;
+
+    // temporarily suspend metadata-spanwrap (if on) so can test if metadata item really exits or not
     bool metadata_exists 
       = (get_meta (collection,collectproto,docinfo,disp,decision.meta,options,
            logout) != "");
 
-    spanwrap = store_spanwrap;
+    metadata_spanwrap = store_metadata_spanwrap;
 
     if (metadata_exists) {
@@ -1594 +1616 @@
     if (options["highlight"] == "1") return "</b>";
     break;
+     case comMetadataSpanWrap:
+        metadata_spanwrap=true;  return "";
+    break;
+     case comEndMetadataSpanWrap:
+    metadata_spanwrap=false; return "";
+    break;
      case comIf:
     return get_if (collection, collectproto, docinfo, disp, 

gsdl/trunk/runtime-src/src/recpt/formattools.h

@@ -33 +33 @@
 
 enum command_t {comIf, comOr, comMeta, comText, comLink, comEndLink, comNum, comIcon, 
-        comDoc, comHighlight, comEndHighlight, comRel, comHref, comSummary,
+        comDoc, comHighlight, comEndHighlight, 
+        comMetadataSpanWrap, comEndMetadataSpanWrap,
+        comRel, comHref, comSummary,
         comTOC, comImage, comDocumentButtonDetach, comDocumentButtonHighlight,
         comDocumentButtonExpandContents, comDocumentButtonExpandText, comOID, comTopOID, comRank,