Changeset 11158

Show
Ignore:
Timestamp:
30.01.2006 13:31:08 (14 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/src/recpt/documentaction.cpp

    r11153 r11158  
    891891    if (unknown) { 
    892892      disp.setmacro ("pagetitle", "document", title); 
    893       disp.setmacro ("imagethispage", "document", title); 
    894893    } else { 
    895894      disp.setmacro ("pagetitle", "document", macroname); 
    896       disp.setmacro ("imagethispage", "document", macroname); 
     895    } 
     896    /* for ns4/image layout compatibility. when this is no longer 
     897     * needed, set imagethispage to _label+title+_ */ 
     898    text_t titlemacroname="_titleimage" + title + "_"; 
     899    disp.expandstring ("Global", titlemacroname, tmp); 
     900    if (tmp == titlemacroname) { /* _titleimage$META_ isn't defined */ 
     901      if (!unknown) /* _label$META_ is defined */ 
     902        disp.setmacro ("imagethispage", "document", macroname); 
     903      else 
     904        disp.setmacro ("imagethispage", "document", title); 
     905    } else { /* _titleimage$META_ is defined */ 
     906      disp.setmacro ("imagethispage", "document", titlemacroname); 
    897907    } 
    898908