Changeset 23515 for main/trunk

Timestamp:

2010-12-21T18:20:39+13:00 (13 years ago)

Author:

davidb

Message:

Generalizatoin of metadata-spanwrap to be either metadata-spanwrap or metadata-divwrap

Location:

main/trunk/greenstone2/runtime-src/src/recpt

Files:

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

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

@@ -33 +33 @@
 #include <assert.h>
 
-static bool metadata_spanwrap = false;
+static bool metadata_wrap = false;
+static text_t metadata_wrap_type = "";
 
 // a few function prototypes
@@ -694 +695 @@
     formatlistptr->command = comEndMetadataSpanWrap;
 
+  else if (meta == "metadata-divwrap")
+    formatlistptr->command = comMetadataDivWrap;
+
+  else if (meta == "/metadata-divwrap")
+    formatlistptr->command = comEndMetadataDivWrap;
+
   else if (meta == "Summary")
     formatlistptr->command = comSummary;
@@ -980 +987 @@
 
 
-static text_t spanwrap_metatext(const text_t& metatext, const text_t& OID, 
+static text_t wrap_metatext(const text_t& metatext, const text_t& OID, 
                 const text_t metaname, int metapos=-1)
 {
 
-  text_t tag_type = (metaname == "Text") ? "div" : "span";
+  text_t tag_type = metadata_wrap_type;
   text_t editable_type = (metaname == "Text") ? "text" : "metadata";
 
@@ -1092 +1099 @@
       }
 
-      if (metadata_spanwrap) {
-    fresh_metatext = spanwrap_metatext(fresh_metatext,OID,meta.metaname,i);
+      if (metadata_wrap) {
+    fresh_metatext = wrap_metatext(fresh_metatext,OID,meta.metaname,i);
       }
       formatted_metatext += fresh_metatext;
@@ -1171 +1178 @@
     }
 
-    if (metadata_spanwrap) {
-      fresh_metatext = spanwrap_metatext(fresh_metatext,OID,meta.metaname,position);
+    if (metadata_wrap) {
+      fresh_metatext = wrap_metatext(fresh_metatext,OID,meta.metaname,position);
     }
 
@@ -1388 +1395 @@
   while (orptr != NULL) {
 
-    if (metadata_spanwrap) {
+    if (metadata_wrap) {
       // 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;
+      // => test for it *without* spanwrap or divwrap, and if defined, then
+      // got back and generate it again, this time with spanwrap/divwrap on
+
+      metadata_wrap = false;
       text_t test_tmp = format_string (collection,collectproto,docinfo, disp, orptr, 
                        options, logout);
-      metadata_spanwrap = true;
+      metadata_wrap = true;
       if (!test_tmp.empty()) {
 
@@ -1665 +1672 @@
   if (decision.command == dMeta) {
 
-    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 store_metadata_wrap = metadata_wrap;
+    metadata_wrap = 0;
+
+    // temporarily suspend metadata-XXXwrap (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) != "");
 
-    metadata_spanwrap = store_metadata_spanwrap;
+    metadata_wrap = store_metadata_wrap;
 
     if (metadata_exists) {
@@ -1897 +1904 @@
     break;
      case comMetadataSpanWrap:
-        metadata_spanwrap=true;  return "";
+        metadata_wrap=true;  metadata_wrap_type="span"; return "";
     break;
      case comEndMetadataSpanWrap:
-    metadata_spanwrap=false; return "";
+    metadata_wrap=false; metadata_wrap_type="";     return "";
+    break;
+     case comMetadataDivWrap:
+        metadata_wrap=true;  metadata_wrap_type="div";  return "";
+    break;
+     case comEndMetadataDivWrap:
+    metadata_wrap=false; metadata_wrap_type="";     return "";
     break;
      case comIf:
@@ -1960 +1973 @@
   }
 
-  if (metadata_spanwrap) {
-    text = spanwrap_metatext(text,docinfo.OID,"Text");
+  if (metadata_wrap) {
+    text = wrap_metatext(text,docinfo.OID,"Text");
   }
 
@@ -2012 +2025 @@
   summary.replace("\n","&#013;");
 
-  if (metadata_spanwrap) {
-    summary = spanwrap_metatext(summary,docinfo.OID,"Summary");
+  if (metadata_wrap) {
+    summary = wrap_metatext(summary,docinfo.OID,"Summary");
   }
 

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

@@ -35 +35 @@
         comDoc, comHighlight, comEndHighlight, 
         comMetadataSpanWrap, comEndMetadataSpanWrap,
+        comMetadataDivWrap, comEndMetadataDivWrap,
         comRel, comHref, comSummary,
         comTOC, comImage, comDocumentButtonDetach, comDocumentButtonHighlight,