Changeset 25821

Show
Ignore:
Timestamp:
26.06.2012 15:38:11 (7 years ago)
Author:
kjdon
Message:

added o=skinandlibdocfinal to see the xslt after second config pass. Don't merge stylesheets after the second pass if not doing debug, just replace the doc contents

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

    r25719 r25821  
    807807            GSXML.addDebugSpanTags(skinAndLibraryDoc); 
    808808        } 
    809  
     809        if (output.equals("skinandlibdocfinal")) { 
     810          return converter.getDOM(getStringFromDocument(skinAndLibraryDoc)); 
     811        } 
    810812        return this.transformer.transform(skinAndLibraryDoc, doc, config_params, docWithDoctype); 
    811813 
     
    863865            format_doc.appendChild(format_doc.importNode(skinAndLibraryDoc.getDocumentElement().cloneNode(true), true)); 
    864866            Node result = this.transformer.transform(configStylesheet_doc, format_doc, config_params); 
    865  
    866867            if (_debug) 
    867868            { 
     
    870871            else 
    871872            { 
    872                 GSXSLT.mergeStylesheets(skinAndLibraryDoc, ((Document) result).getDocumentElement(), true); 
     873              //GSXSLT.mergeStylesheets(skinAndLibraryDoc, ((Document) result).getDocumentElement(), true); 
     874              // we just want the result of the transform to be in skinAndLibraryDoc 
     875              Element old_doc = skinAndLibraryDoc.getDocumentElement(); 
     876              skinAndLibraryDoc.removeChild(old_doc); 
     877              skinAndLibraryDoc.appendChild(skinAndLibraryDoc.importNode(((Document) result).getDocumentElement(), true)); 
    873878            } 
    874879        }