Changeset 12943

Timestamp:

2006-09-29T15:32:25+12:00 (18 years ago)

Author:

kjdon

Message:

look for gs.DocumentHeader and DocumentHeader metadata, and if found, set the document:documentheader macro to this value

File:

• trunk/gsdl/src/recpt/documentaction.cpp (modified) (4 diffs)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -709 +709 @@
   //                        to the archivedir metadata element
 
+  // _documentheader_       Custom header info for the specified document
   // must have a valid collection server to continue
 
@@ -733 +734 @@
 
   metadata.insert ("Title");
-
+  metadata.insert ("gs.DocumentHeader");
+  metadata.insert ("DocumentHeader");
+  
   bool fulltoc = false;
 
@@ -788 +791 @@
 
       disp.setmacro ("header", "document", "_textheader_");
-      
       text_tarray pagetitlearray;
       if (!response.docInfo[0].metadata["Title"].values[0].empty())
@@ -823 +825 @@
       disp.setmacro ("pagetitle", "document", pagetitle);
 
+      // custom header info
+      text_t custom_header;
+      if (is_top (arg_d)) {
+    custom_header = response.docInfo[0].metadata["gs.DocumentHeader"].values[0];
+    if (custom_header.empty()) {
+      // try ex header
+      custom_header = response.docInfo[0].metadata["DocumentHeader"].values[0]; 
+    }
+      } else {
+    MetadataInfo_t *parentch = response.docInfo[0].metadata["gs.DocumentHeader"].parent;
+    while (parentch != NULL) {
+      custom_header = parentch->values[0];
+      parentch = parentch->parent;
+    }
+    if (custom_header.empty()) {
+      // try ex header
+      MetadataInfo_t *parentch = response.docInfo[0].metadata["DocumentHeader"].parent;
+      while (parentch != NULL) {
+        custom_header = parentch->values[0];
+        parentch = parentch->parent;
+      }
+    }
+      }
+      if (!custom_header.empty()) {
+    disp.setmacro("documentheader", "document", custom_header);
+      }
+    
       if (is_top (arg_d))
     disp.setmacro ("thisOID", displayclass::defaultpackage, dm_safe(response.docInfo[0].metadata["archivedir"].values[0]));