Changeset 26027 for main

Timestamp:

2012-07-26T11:31:28+12:00 (12 years ago)

Author:

sjm84

Message:

Also check the site directory to see if there is any XSL files at this level

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSFile.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSFile.java

@@ -518 +518 @@
 
                     System.err.println(inC.transferTo(0, inC.size(), outC));
-                    
+
                     in.close();
                     out.close();
@@ -539 +539 @@
     {
         ArrayList<File> filesToReturn = new ArrayList<File>();
-        
-        File siteCollectionDir = new File(GSFile.siteHome(GlobalProperties.getGSDL3Home(), siteName) + File.separator + "collect");
-        if(siteCollectionDir.exists() && siteCollectionDir.isDirectory())
+
+        String siteHome = GSFile.siteHome(GlobalProperties.getGSDL3Home(), siteName);
+
+        //Add XSL files from the site transform directory
+        File siteTransformDir = new File(siteHome + File.separator + "transform");
+        if (siteTransformDir.exists() && siteTransformDir.isDirectory())
+        {
+            filesToReturn.addAll(getXSLFilesFromDirectoryRecursive(siteTransformDir));
+        }
+
+        //Add XSL files from collection transform directories
+        File siteCollectionDir = new File(siteHome + File.separator + "collect");
+        if (siteCollectionDir.exists() && siteCollectionDir.isDirectory())
         {
             File[] collections = siteCollectionDir.listFiles();
-            
-            for(File collection : collections)
-            {
-                if(collection.isDirectory())
+
+            for (File collection : collections)
+            {
+                if (collection.isDirectory())
                 {
                     File collectionTranformDir = new File(collection.getAbsolutePath() + File.separator + "transform");
-                    if(collectionTranformDir.exists() && collectionTranformDir.isDirectory())
+                    if (collectionTranformDir.exists() && collectionTranformDir.isDirectory())
                     {
                         filesToReturn.addAll(getXSLFilesFromDirectoryRecursive(collectionTranformDir));
@@ -557 +567 @@
             }
         }
-        
-        filesToReturn.addAll(getXSLFilesFromDirectoryRecursive(new File(GSFile.interfaceHome(GlobalProperties.getGSDL3Home(), interfaceName) + File.separator + "transform")));
-        
+
+        //Add XSL files from the interface transform directory
+        File interfaceTransformDir = new File(GSFile.interfaceHome(GlobalProperties.getGSDL3Home(), interfaceName) + File.separator + "transform");
+        if (interfaceTransformDir.exists() && interfaceTransformDir.isDirectory())
+        {
+            filesToReturn.addAll(getXSLFilesFromDirectoryRecursive(interfaceTransformDir));
+        }
+
         return filesToReturn;
     }
@@ -566 +581 @@
     {
         ArrayList<File> filesToReturn = new ArrayList<File>();
-        
-        if(!directory.isDirectory())
+
+        if (!directory.isDirectory())
         {
             return filesToReturn;
         }
-        
+
         File[] currentFiles = directory.listFiles();
-        for(File current : currentFiles)
-        {
-            if(current.isDirectory())
+        for (File current : currentFiles)
+        {
+            if (current.isDirectory())
             {
                 filesToReturn.addAll(GSFile.getXSLFilesFromDirectoryRecursive(current));
             }
-            else if(current.getName().endsWith(".xsl"))
+            else if (current.getName().endsWith(".xsl"))
             {
                 filesToReturn.add(current);
             }
         }
-        
+
         return filesToReturn;
     }