Changeset 32111

Timestamp:

2018-02-01T13:28:54+13:00 (6 years ago)

Author:

kjdon

Message:

pass in base interfaces array to the call to find archive2document.xsl. If you have a custom interface it will probably live in hte default one. Then check to make sure the file was there before trying to use it.

File:

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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

@@ -966 +966 @@
     protected Element transformArchiveToDocument(Element section) {
     
-    String stylesheet_file = GSFile.stylesheetFile(GlobalProperties.getGSDL3Home(), (String) this.config_params.get(GSConstants.SITE_NAME), "", (String) this.config_params.get(GSConstants.INTERFACE_NAME), null, "archive2document.xsl");
-    Document stylesheet_doc = XMLConverter.getDOM(new File(stylesheet_file));
+      String stylesheet_filename = GSFile.stylesheetFile(GlobalProperties.getGSDL3Home(), (String) this.config_params.get(GSConstants.SITE_NAME), "", (String) this.config_params.get(GSConstants.INTERFACE_NAME), (ArrayList<String>) this.config_params.get(GSConstants.BASE_INTERFACES), "archive2document.xsl");
+      if (stylesheet_filename == null) {
+    logger.error("Couldn't find stylesheet archive2document.xsl");
+    return section;
+      }
+         
+    Document stylesheet_doc = XMLConverter.getDOM(new File(stylesheet_filename));
     if (stylesheet_doc == null) {
-      logger.error("Couldn't load in stylesheet "+stylesheet_file);
+      logger.error("Couldn't load in stylesheet "+stylesheet_filename);
       return section;
     }