Changeset 27991

Show
Ignore:
Timestamp:
07.08.2013 09:52:40 (6 years ago)
Author:
sjm84
Message:

Get gslib.xsl the way we get all other xsl files

Files:
1 modified

Legend:

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

    r27617 r27991  
    808808        try 
    809809        { 
    810             String gsLibFile = this.getGSLibXSLFilename(); 
    811             if (new File(gsLibFile).exists()) 
    812             { 
    813                 libraryXsl = getDoc(gsLibFile); 
    814                 String errMsg = ((XMLConverter.ParseErrorHandler) parser.getErrorHandler()).getErrorMessage(); 
    815                 if (errMsg != null) 
    816                 { 
    817                     return XMLTransformer.constructErrorXHTMLPage("Error loading xslt file: " + this.getGSLibXSLFilename() + "\n" + errMsg); 
    818                 } 
    819             } 
    820         } 
    821         catch (java.io.FileNotFoundException e) 
    822         { 
    823             return fileNotFoundErrorPage(e.getMessage()); 
     810            libraryXsl = GSXSLT.mergedXSLTDocumentCascade("gslib.xsl", (String) this.config_params.get(GSConstants.SITE_NAME), collection, (String) this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces, _debug); 
    824811        } 
    825812        catch (Exception e)