Changeset 33647

Show
Ignore:
Timestamp:
12.11.2019 09:30:46 (4 weeks ago)
Author:
kjdon
Message:

added/changed a few of the output values for debugging the transform

Files:
1 modified

Legend:

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

    r33641 r33647  
    739739        Element format_elem = (Element) GSXML.getChildByTagName(page_response, GSXML.FORMAT_ELEM); 
    740740 
    741         if (output.equals("format")) 
     741        if (output.equals("format1")) 
    742742        { 
    743743            return format_elem; 
     
    790790                } 
    791791                 
    792                 if (output.equals("newformat")) 
     792                if (output.equals("format")) 
    793793                { 
    794794                    return new_format; 
     
    820820        } 
    821821 
     822        Document inline_template_doc = null; 
    822823        if (inline_template != null) 
    823824        { 
    824825            try 
    825826            { 
    826                 Document inline_template_doc = this.converter.getDOM("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<xsl:stylesheet version=\"1.0\" "+GSXML.ALL_NAMESPACES_ATTS +  ">" + inline_template + "</xsl:stylesheet>", "UTF-8"); 
     827              inline_template_doc = this.converter.getDOM("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<xsl:stylesheet version=\"1.0\" "+GSXML.ALL_NAMESPACES_ATTS +  ">" + inline_template + "</xsl:stylesheet>", "UTF-8"); 
    827828 
    828829                if (_debug) 
     
    842843        } 
    843844 
     845         
     846        if (output.equals("ilt")) { 
     847          return converter.getDOM(getStringFromDocument(inline_template_doc)); 
     848        } 
    844849        if (output.equals("xsl3")) { 
    845850          return converter.getDOM(getStringFromDocument(page_xsl)); 
     
    906911    return converter.getDOM(getStringFromDocument(preprocessingXsl)); 
    907912  } 
    908   if (output.equals("gslib")) { 
     913  if (output.equals("gslib1")) { 
    909914    return converter.getDOM(getStringFromDocument(libraryXsl)); 
    910915  } 
     
    919924        // debug?? use debug method?? or does it not make sense here?? 
    920925        GSXSLT.inlineImportAndIncludeFiles(libraryXsl, null, (String) this.config_params.get(GSConstants.SITE_NAME), collection, (String) this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces); 
     926  if (output.equals("gslib")) { 
     927    return converter.getDOM(getStringFromDocument(libraryXsl)); 
     928  } 
    921929 
    922930        // now, we transform all the gslib elements 
     
    956964         
    957965 
    958         if (output.equals("xsl6") || output.equals("skinandlibdocfinal")) 
     966        if (output.equals("xsl") || output.equals("skinandlibdocfinal")) 
    959967        { 
    960968          return converter.getDOM(getStringFromDocument(skinAndLibraryDoc));