Changeset 25999 for main/trunk

Timestamp:

2012-07-23T14:38:25+12:00 (12 years ago)

Author:

xiao

Message:

gslib file may be non-existent in some servlets (it's not there for flax and not necessary for it), therefore the code can't assume it exists and try to use it.

File:

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

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

@@ -582 +582 @@
         try
         {
-            libraryXsl = getDoc(this.getGSLibXSLFilename());
-            String errMsg = ((XMLConverter.ParseErrorHandler) parser.getErrorHandler()).getErrorMessage();
-            if (errMsg != null)
-            {
-                return XMLTransformer.constructErrorXHTMLPage("Error loading xslt file: " + this.getGSLibXSLFilename() + "\n" + errMsg);
+            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);
+                }
             }
         }
@@ -619 +622 @@
 
             Element l = skinAndLibraryXsl.createElement("libraryXsl");
-            Element libraryXsl_el = libraryXsl.getDocumentElement();
-            l.appendChild(skinAndLibraryXsl.importNode(libraryXsl_el, true));
+            if(libraryXsl  != null) {
+                Element libraryXsl_el = libraryXsl.getDocumentElement();
+                l.appendChild(skinAndLibraryXsl.importNode(libraryXsl_el, true));
+            }   
             root.appendChild(l);
+            
             //System.out.println("Skin and Library XSL are now together") ;