Changeset 27991 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

Timestamp:

2013-08-07T09:52:40+12:00 (11 years ago)

Author:

sjm84

Message:

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

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

@@ -808 +808 @@
         try
         {
-            String gsLibFile = this.getGSLibXSLFilename();
-            if (new File(gsLibFile).exists())
-            {
-                libraryXsl = getDoc(gsLibFile);
-                String errMsg = ((XMLConverter.ParseErrorHandler) parser.getErrorHandler()).getErrorMessage();
-                if (errMsg != null)
-                {
-                    return XMLTransformer.constructErrorXHTMLPage("Error loading xslt file: " + this.getGSLibXSLFilename() + "\n" + errMsg);
-                }
-            }
-        }
-        catch (java.io.FileNotFoundException e)
-        {
-            return fileNotFoundErrorPage(e.getMessage());
+            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);
         }
         catch (Exception e)