Changeset 4860

Timestamp:

2003-07-02T16:41:24+12:00 (21 years ago)

Author:

kjdon

Message:

we now look for stylesheets in teh collection before the site - note this only works for local sites

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3

Files:

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

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

@@ -118 +118 @@
     String action = request.getAttribute("action");
     String subaction = request.getAttribute("subaction");
-    String xslt_file = getXSLTFileName(action, subaction);
+    
+    Element cgi_param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+    String collection = "";
+    if (cgi_param_list != null) {
+        HashMap params = GSXML.extractParams(cgi_param_list, false);
+        collection = (String)params.get(GSCGI.COLLECTION_ARG);
+        if (collection == null) collection = "";
+    }
+    
+    String xslt_file = getXSLTFileName(action, subaction, collection);
     if (xslt_file==null) {
         // cant transform the page - return null or the original?
@@ -133 +142 @@
         
         // need to transform the format info
-        String stylesheet_file = GSFile.stylesheetFile((String)this.config_params.get(GSConstants.GSDL3_HOME), (String)this.config_params.get(GSConstants.SITE_NAME), (String)this.config_params.get(GSConstants.INTERFACE_NAME),  "config_format.xsl");
+        String stylesheet_file = GSFile.stylesheetFile((String)this.config_params.get(GSConstants.GSDL3_HOME), (String)this.config_params.get(GSConstants.SITE_NAME), (String)this.config_params.get(GSConstants.INTERFACE_NAME), "",   "config_format.xsl");
         Document stylesheet = this.converter.getDOM(new File(stylesheet_file));
         Document format_doc = this.converter.newDOM();
@@ -145 +154 @@
     
     // there is a thing called a URIResolver which you can set for a transformer or transformer factory. may be able to use this instead of this absoluteIncludepaths hack
-    GSXSLT.absoluteIncludePaths(style_doc, (String)this.config_params.get(GSConstants.GSDL3_HOME), (String)this.config_params.get(GSConstants.SITE_NAME), (String)this.config_params.get(GSConstants.INTERFACE_NAME));
+    GSXSLT.absoluteIncludePaths(style_doc, (String)this.config_params.get(GSConstants.GSDL3_HOME), (String)this.config_params.get(GSConstants.SITE_NAME), (String)this.config_params.get(GSConstants.INTERFACE_NAME), collection);
     // put the page into a document - this is necessary for xslt to get the paths right if you have paths relative to the document root eg /page.
     Document doc = this.converter.newDOM();
@@ -152 +161 @@
     }
 
-    protected String getXSLTFileName(String action, String subaction) {
+    protected String getXSLTFileName(String action, String subaction,
+                     String collection) {
 
     String name = null;
@@ -164 +174 @@
     }
     // now find the absolute path
-    String stylesheet = GSFile.stylesheetFile((String)this.config_params.get(GSConstants.GSDL3_HOME), (String)this.config_params.get(GSConstants.SITE_NAME), (String)this.config_params.get(GSConstants.INTERFACE_NAME), name);
+    String stylesheet = GSFile.stylesheetFile((String)this.config_params.get(GSConstants.GSDL3_HOME), (String)this.config_params.get(GSConstants.SITE_NAME), (String)this.config_params.get(GSConstants.INTERFACE_NAME), collection, name);
     if (stylesheet==null) {
         System.out.println("cant find stylesheet for "+name);

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

@@ -148 +148 @@
     }
     
-    
+
     /** returns the absolute path to a stylesheet 
      * stylesheets are looked for in the following order
+     * collect-specific, 
      * site-specific, interface-specific, default
      * returns null  if the file cannot be found 
@@ -158 +159 @@
                     String site_name,
                     String interface_name,
+                    String collection,
                     String filename) {
-    // try site one first
+
     String site_home = siteHome(gsdl3_home, site_name);
-    File stylesheet = new File(site_home +File.separatorChar+
+    // try collection first
+    File stylesheet = null;
+    if (!collection.equals("")) {
+        
+        String coll_home = collectionBaseDir(site_home, collection);
+        stylesheet = new File(coll_home +File.separatorChar+
+                  "transform"+File.separatorChar+filename);
+        if (stylesheet.exists()) {
+        return stylesheet.getPath();
+        }
+    }
+    // try site one next
+    
+    stylesheet = new File(site_home +File.separatorChar+
                    "transform"+File.separatorChar+filename);
     if (stylesheet.exists()) {

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

@@ -42 +42 @@
                         String gsdl3_home,
                         String site_name,
-                        String interface_name) {
+                        String interface_name,
+                        String collection) {
     
     
@@ -50 +51 @@
         String name = child.getNodeName();
         if (name.equals("xsl:import") || name.equals("xsl:include")) {
-        ((Element)child).setAttribute("href", GSFile.stylesheetFile(gsdl3_home, site_name, interface_name, ((Element)child).getAttribute("href")));
+        ((Element)child).setAttribute("href", GSFile.stylesheetFile(gsdl3_home, site_name, interface_name, collection, ((Element)child).getAttribute("href")));
         }
         child = child.getNextSibling();