Changeset 25988 for main/trunk

Timestamp:

2012-07-19T15:39:33+12:00 (12 years ago)

Author:

kjdon

Message:

inlineImport... now calls mergedXSLTDocumentCascade to find all copies of a particular stylesheet and merge them, before inlining it. needs lots more arguments

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• core/TransformingReceptionist.java (modified) (1 diff)
• util/GSXSLT.java (modified) (3 diffs)

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

@@ -739 +739 @@
         }
 
-        GSXSLT.inlineImportAndIncludeFiles(skinAndLibraryDoc, null, (String) this.config_params.get(GSConstants.INTERFACE_NAME));
+        GSXSLT.inlineImportAndIncludeFiles(skinAndLibraryDoc, null, (String) this.config_params.get(GSConstants.SITE_NAME), collection, (String) this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces);
         skinAndLibraryDoc = (Document) secondConfigFormatPass(collection, skinAndLibraryDoc, doc, new UserContext(request));
 

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

@@ -220 +220 @@
     }
 
-  public static void inlineImportAndIncludeFiles(Document doc, String pathExtra, String interface_name)
-    {
-      inlineImportAndIncludeFilesDebug(doc, pathExtra, false, null, interface_name);
-    }
-
-  public static void inlineImportAndIncludeFilesDebug(Document doc, String pathExtra, boolean debug, String docFileName, String interface_name)
+  public static void inlineImportAndIncludeFiles(Document doc, String pathExtra, String site, String collection, String interface_name, ArrayList<String> base_interfaces)
+    {
+      inlineImportAndIncludeFilesDebug(doc, pathExtra, false, null, site, collection, interface_name, base_interfaces);
+    }
+
+  public static void inlineImportAndIncludeFilesDebug(Document doc, String pathExtra, boolean debug, String docFileName, String site, String collection, String interface_name, ArrayList<String> base_interfaces)
     {
         XMLConverter converter = new XMLConverter();
@@ -238 +238 @@
             Element current = (Element) ((i < importList.getLength()) ? importList.item(i) : includeList.item(i - importList.getLength()));
             String href = current.getAttribute("href");
-            String filePath = GSFile.interfaceHome(GlobalProperties.getGSDL3Home(), interface_name) + File.separator + "transform" + File.separator + path.replace("/", File.separator) + href.replace("/", File.separator);
+            //String filePath = GSFile.interfaceHome(GlobalProperties.getGSDL3Home(), interface_name) + File.separator + "transform" + File.separator + path.replace("/", File.separator) + href.replace("/", File.separator);
             //String filePath = GSFile.stylesheetFile(GlobalProperties.getGSDL3Home(), site_name, collection, interface_name, base_interfaces, 
 
             try
             {
-                Document inlineDoc = converter.getDOM(new File(filePath), "UTF-8");
-
+              //Document inlineDoc = converter.getDOM(new File(filePath), "UTF-8");
+              Document inlineDoc = mergedXSLTDocumentCascade(path+href, site, collection, interface_name, base_interfaces, debug);
                 String newPath = path;
                 int lastSepIndex = href.lastIndexOf("/");
@@ -253 +253 @@
 
                 //Do this recursively
-                inlineImportAndIncludeFilesDebug(inlineDoc, newPath, debug, filePath, interface_name);
-
-                GSXSLT.mergeStylesheetsDebug(doc, inlineDoc.getDocumentElement(), false, debug, docFileName, filePath);
+                inlineImportAndIncludeFilesDebug(inlineDoc, newPath, debug, "merged "+href/*filePath*/, site, collection, interface_name, base_interfaces);
+
+                GSXSLT.mergeStylesheetsDebug(doc, inlineDoc.getDocumentElement(), false, debug, docFileName, /*filePath*/"merged "+href);
             }
             catch (Exception ex)