Changeset 11158 for trunk/gsdl

Timestamp:

2006-01-30T13:31:08+13:00 (18 years ago)

Author:

jrm21

Message:

for setting _imagethispage_, first look for _titleimage$META_.
This is only set by the nav_ns4.dm macro file. If that macro isn't
found, we fall back to _label$META_, and then just $META.

File:

• trunk/gsdl/src/recpt/documentaction.cpp (modified) (1 diff)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -891 +891 @@
     if (unknown) {
       disp.setmacro ("pagetitle", "document", title);
-      disp.setmacro ("imagethispage", "document", title);
     } else {
       disp.setmacro ("pagetitle", "document", macroname);
-      disp.setmacro ("imagethispage", "document", macroname);
+    }
+    /* for ns4/image layout compatibility. when this is no longer
+     * needed, set imagethispage to _label+title+_ */
+    text_t titlemacroname="_titleimage" + title + "_";
+    disp.expandstring ("Global", titlemacroname, tmp);
+    if (tmp == titlemacroname) { /* _titleimage$META_ isn't defined */
+      if (!unknown) /* _label$META_ is defined */
+        disp.setmacro ("imagethispage", "document", macroname);
+      else
+        disp.setmacro ("imagethispage", "document", title);
+    } else { /* _titleimage$META_ is defined */
+      disp.setmacro ("imagethispage", "document", titlemacroname);
     }