Changeset 27999 for main/trunk/greenstone3

Timestamp:

2013-08-08T12:07:24+12:00 (11 years ago)

Author:

sjm84

Message:

Fixes for metadata with base interfaces

Location:

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

Files:

• core/TransformingReceptionist.java (modified) (2 diffs)
• util/GSFile.java (modified) (2 diffs)

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

@@ -189 +189 @@
     protected void getRequiredMetadataNamesFromXSLFiles()
     {
-        ArrayList<File> xslFiles = GSFile.getAllXSLFiles((String) this.config_params.get(GSConstants.INTERFACE_NAME), (String) this.config_params.get(GSConstants.SITE_NAME));
+        ArrayList<File> xslFiles = GSFile.getAllXSLFiles((String) this.config_params.get((String) this.config_params.get(GSConstants.SITE_NAME)));
 
         HashMap<String, ArrayList<String>> includes = new HashMap<String, ArrayList<String>>();
@@ -364 +364 @@
         }
 
-        String stylesheetFile = GSFile.interfaceStylesheetFile(GlobalProperties.getGSDL3Home(), (String) this.config_params.get(GSConstants.INTERFACE_NAME), name);
-        stylesheetFile = stylesheetFile.replace("/", File.separator);
-
-        ArrayList<String> requiredMetadata = _metadataRequiredMap.get(stylesheetFile);
-
-        if (requiredMetadata != null)
-        {
-            Element extraMetadataList = this.doc.createElement(GSXML.EXTRA_METADATA + GSXML.LIST_MODIFIER);
-
-            for (String metadataString : requiredMetadata)
-            {
-                Element metadataElem = this.doc.createElement(GSXML.EXTRA_METADATA);
-                metadataElem.setAttribute(GSXML.NAME_ATT, metadataString);
-                extraMetadataList.appendChild(metadataElem);
-            }
-            request.appendChild(request.getOwnerDocument().importNode(extraMetadataList, true));
-        }
+        Element cgi_param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+        String collection = "";
+
+        if (cgi_param_list != null)
+        {
+            // Don't waste time getting all the parameters
+            HashMap<String, Serializable> params = GSXML.extractParams(cgi_param_list, false);
+            collection = (String) params.get(GSParams.COLLECTION);
+            if (collection == null)
+            {
+                collection = "";
+            }
+        }
+
+        ArrayList<File> stylesheets = GSFile.getStylesheetFiles(GlobalProperties.getGSDL3Home(), (String) this.config_params.get(GSConstants.SITE_NAME), collection, (String) this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces, name);
+
+        Element extraMetadataList = this.doc.createElement(GSXML.EXTRA_METADATA + GSXML.LIST_MODIFIER);
+        for (File stylesheet : stylesheets)
+        {
+            ArrayList<String> requiredMetadata = _metadataRequiredMap.get(stylesheet.getAbsolutePath());
+
+            if (requiredMetadata != null)
+            {
+                for (String metadataString : requiredMetadata)
+                {
+                    Element metadataElem = this.doc.createElement(GSXML.EXTRA_METADATA);
+                    metadataElem.setAttribute(GSXML.NAME_ATT, metadataString);
+                    extraMetadataList.appendChild(metadataElem);
+                }
+            }
+        }
+        request.appendChild(request.getOwnerDocument().importNode(extraMetadataList, true));
     }
 

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

@@ -531 +531 @@
     }
 
-    public static ArrayList<File> getAllXSLFiles(String interfaceName, String siteName)
+    public static ArrayList<File> getAllXSLFiles(String siteName)
     {
         ArrayList<File> filesToReturn = new ArrayList<File>();
@@ -564 +564 @@
 
         //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));
+        File interfaceDir = new File(GlobalProperties.getGSDL3Home() + File.separator + "interfaces");
+        if (interfaceDir.exists() && interfaceDir.isDirectory())
+        {
+            filesToReturn.addAll(getXSLFilesFromDirectoryRecursive(interfaceDir));
         }