Changeset 25985

Show
Ignore:
Timestamp:
19.07.2012 14:38:18 (7 years ago)
Author:
sjm84
Message:

All of the actions that use format statements will now merge in the global format statement

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

    r25968 r25985  
    681681        if (format_elem != null) 
    682682        { 
    683             logger.debug("doc action found a format statement"); 
    684             // set teh format type 
     683            Element global_format_elem = (Element) GSXML.getChildByTagName(format_resp, GSXML.GLOBAL_FORMAT_ELEM); 
     684            if(global_format_elem != null) 
     685            { 
     686                GSXSLT.mergeFormatElements(format_elem, global_format_elem, false); 
     687            } 
     688 
     689            // set the format type 
    685690            format_elem.setAttribute(GSXML.TYPE_ATT, "display"); 
    686691            page_response.appendChild(this.doc.importNode(format_elem, true));