Changeset 8562

Timestamp:

2004-11-16T12:22:43+13:00 (19 years ago)

Author:

kjdon

Message:

interfaces are now based on another, rather than all using the default as a base. So the chain of looking for xslt is now collection, site, current interface, base interfaces (maybe more than one or none)

Location:

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

Files:

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

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

@@ -13 +13 @@
 import java.util.HashMap;
 import java.util.Enumeration;
+import java.util.ArrayList;
 
 /** the most basic Receptionist, used for interface generation. 
@@ -40 +41 @@
     protected Element language_list = null;
 
+    /** the list of interfaces this is based on */
+    protected ArrayList base_interfaces = null;
+    
     public Receptionist() {
     this.converter = new XMLConverter();
@@ -78 +82 @@
     
     Element config_doc = this.converter.getDOM(interface_config_file).getDocumentElement();
+    String base_interface = config_doc.getAttribute("baseInterface");
+    setUpBaseInterface(base_interface);
     Element action_list = (Element)GSXML.getChildByTagName(config_doc, GSXML.ACTION_ELEM+GSXML.LIST_MODIFIER);
     NodeList actions = action_list.getElementsByTagName(GSXML.ACTION_ELEM);
@@ -193 +199 @@
     page.appendChild(page_response);
 
-    ///ystem.out.println("REceptionist: raw page="+this.converter.getString(page));
+    ///ystem.out.println("Receptionist: raw page="+this.converter.getString(page));
     // transform the result in some way
     Element resulting_page = postProcessPage(page);
@@ -200 +206 @@
     }
 
+    protected boolean setUpBaseInterface(String base_interface) {
+    if (base_interface== null || base_interface.equals("")) {
+        // there was no base interface, the list remains null
+        return true;
+    }
+    // foreach base interface
+    while (!base_interface.equals("")) {
+        // find the base interface config file
+        File base_interface_config_file = new File(GSFile.interfaceConfigFile(GSFile.interfaceHome((String)this.config_params.get(GSConstants.GSDL3_HOME), base_interface)));
+        if (!base_interface_config_file.exists()) {
+        System.err.println("Receptionist: base interface config file: "+base_interface_config_file.getPath()+" not found!");
+        return false;
+        }
+        // the interface name is valid, add it to the list
+        if (base_interfaces == null) {
+        base_interfaces = new ArrayList();
+        }
+        base_interfaces.add(base_interface);
+        // now see if this has a base interface
+        Element config_doc = this.converter.getDOM(base_interface_config_file).getDocumentElement();
+        base_interface = config_doc.getAttribute("baseInterface");
+    }
+    return true;
+    }
     protected void preProcessRequest(Element request) {
     return;

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

@@ -54 +54 @@
     
     Element config_doc = this.converter.getDOM(interface_config_file, "utf-8").getDocumentElement();
+    String base_interface = config_doc.getAttribute("baseInterface");
+    setUpBaseInterface(base_interface);
     Element action_list = (Element)GSXML.getChildByTagName(config_doc, GSXML.ACTION_ELEM+GSXML.LIST_MODIFIER);
     NodeList actions = action_list.getElementsByTagName(GSXML.ACTION_ELEM);
@@ -122 +124 @@
     protected Element transformPage(Element page) {
 
+    //ystem.out.println("page before transfomring:");
+    //ystem.out.println(this.converter.getPrettyString(page));
+
     Element request = (Element)GSXML.getChildByTagName(page, GSXML.PAGE_REQUEST_ELEM);
     String action = request.getAttribute("action");
@@ -147 +152 @@
     if (format_elem != null) {
         //page_response.removeChild(format_elem);
-        
+        ///ystem.err.println("format elem="+this.converter.getPrettyString(format_elem));
         // 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), collection, (String)this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces,   "config_format.xsl");
         Document stylesheet = this.converter.getDOM(new File(stylesheet_file));
         Document format_doc = this.converter.newDOM();
         format_doc.appendChild(format_doc.importNode(format_elem, true));
         Element new_format = (Element)this.transformer.transform(stylesheet, format_doc);
+        ///ystem.err.println("new format elem="+this.converter.getPrettyString(new_format));
+        
         // add it in to the main stylesheet
         GSXSLT.mergeStylesheets(style_doc, new_format);
@@ -161 +168 @@
     
     // 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), collection);
+    GSXSLT.absoluteIncludePaths(style_doc, (String)this.config_params.get(GSConstants.GSDL3_HOME), (String)this.config_params.get(GSConstants.SITE_NAME), collection, (String)this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces);
     // 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();
@@ -181 +188 @@
     }
     // 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), collection, name);
+    String stylesheet = GSFile.stylesheetFile((String)this.config_params.get(GSConstants.GSDL3_HOME), (String)this.config_params.get(GSConstants.SITE_NAME), collection, (String)this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces, name);
     if (stylesheet==null) {
         System.out.println("TransformingReceptionist: cant find stylesheet for "+name);

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

@@ -29 +29 @@
 import java.lang.ClassLoader; // to find files on the class path
 import java.net.URL;
+import java.util.ArrayList;
 
 /**
@@ -210 +211 @@
     
     /** returns the absolute path to a stylesheet 
-     * stylesheets are looked for in the following order
-     * collect-specific, 
-     * site-specific, interface-specific, default
+     * stylesheets are looked for in the following places, in the 
+     * following order:
+     * current collection, current site, current interface, base interfaces
      * returns null  if the file cannot be found 
      *
@@ -218 +219 @@
     static public String stylesheetFile(String gsdl3_home,
                     String site_name,
+                    String collection,
                     String interface_name,
-                    String collection,
+                    ArrayList base_interfaces,
                     String filename) {
 
@@ -234 +236 @@
         }
     }
-    // try site one next
     
+    // try site one next    
     stylesheet = new File(site_home +File.separatorChar+
-                   "transform"+File.separatorChar+filename);
+                  "transform"+File.separatorChar+filename);
     if (stylesheet.exists()) {
         return stylesheet.getPath();
     }
+    
     // try current interface
     String interface_home = interfaceHome(gsdl3_home, 
@@ -249 +252 @@
         return stylesheet.getPath();
     }
-    // try default interface
-    interface_home = interfaceHome(gsdl3_home, "default");
-    stylesheet = new File(interface_home+File.separatorChar+
-                  "transform"+File.separatorChar+filename);
-    if (stylesheet.exists()) {
-        return stylesheet.getPath();
+    // try base interface
+    if (base_interfaces==null || base_interfaces.size()==0) {
+        return null; // no base interfaces to look for
+    }
+    for (int i=0; i<base_interfaces.size(); i++) {
+        interface_home = interfaceHome(gsdl3_home, (String)base_interfaces.get(i));
+        stylesheet = new File(interface_home+File.separatorChar+
+                  "transform"+File.separatorChar+filename);
+        if (stylesheet.exists()) {
+        return stylesheet.getPath();
+        }
     }
         
-    // cant find it
+    // still can't find it and we have looked everywhere
     return null;
     }

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

@@ -9 +9 @@
 import java.util.HashMap;
 import java.util.Vector;
+import java.util.ArrayList;
 
 /** various functions for manipulating Greenstone xslt  */
@@ -42 +43 @@
                         String gsdl3_home,
                         String site_name,
+                        String collection,
                         String interface_name,
-                        String collection) {
+                        ArrayList base_interfaces) {
     
     
@@ -51 +53 @@
         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, collection, ((Element)child).getAttribute("href")));
+        ((Element)child).setAttribute("href", GSFile.stylesheetFile(gsdl3_home, site_name, collection, interface_name, base_interfaces, ((Element)child).getAttribute("href")));
         }
         child = child.getNextSibling();