Ignore:
Timestamp:
2012-07-19T14:38:26+12:00 (12 years ago)
Author:
sjm84
Message:

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

File:
1 edited

Legend:

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

    r25984 r25986  
    99import org.greenstone.gsdl3.util.GSPath;
    1010import org.greenstone.gsdl3.util.GSXML;
     11import org.greenstone.gsdl3.util.GSXSLT;
    1112import org.greenstone.gsdl3.util.OID;
    1213import org.greenstone.gsdl3.util.UserContext;
     
    1415import org.w3c.dom.Node;
    1516import org.w3c.dom.NodeList;
    16 OTE: this class not used at present!!!!!
     17
     18//NOTE: this class not used at present!!!!!
    1719/** action for classifier browsing */
    1820public class BrowseAction extends Action
     
    130132            if (this_format != null)
    131133            {
     134                Element global_format_elem = (Element) GSXML.getChildByTagName(format_response, GSXML.GLOBAL_FORMAT_ELEM);
     135                if(global_format_elem != null)
     136                {
     137                    GSXSLT.mergeFormatElements(this_format, global_format_elem, false);
     138                }
    132139                Element new_format = GSXML.duplicateWithNewName(this.doc, this_format, GSXML.FORMAT_ELEM, false);
    133140                // set teh format type
Note: See TracChangeset for help on using the changeset viewer.