Changeset 4691

Timestamp:

2003-06-18T11:37:07+12:00 (21 years ago)

Author:

kjdon

Message:

several changes: ConfigVars replaced by a HashMap, we no longer add in the translation or config info to teh xml page before transformation: the config vars are set as parameters to teh stylesheet, the language stuff is done on the fly by teh stylesheet calling the resource bundle stuff

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java (modified) (9 diffs)

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

@@ -37 +37 @@
     public boolean configure() {
     
-    if (this.config==null) {
+    if (this.config_params==null) {
         System.err.println("Receptionist Error: config variables must be set before calling configure");
         return false;
@@ -47 +47 @@
     
     // find the config file containing a list of actions
-    File interface_config_file = new File(GSFile.interfaceConfigFile(GSFile.interfaceHome(this.config.gsdl3_home_, this.config.interface_name_)));
+    File interface_config_file = new File(GSFile.interfaceConfigFile(GSFile.interfaceHome((String)this.config_params.get(GSConstants.GSDL3_HOME), (String)this.config_params.get(GSConstants.INTERFACE_NAME))));
     if (!interface_config_file.exists()) {
         System.err.println("TransformingReceptionist: interface config file: "+interface_config_file.getPath()+" not found!");
@@ -65 +65 @@
         ac = (Action)Class.forName("org.greenstone.gsdl3.action."+class_name).newInstance();
         } catch (Exception e) {
-        System.out.println("couldn't load in action "+class_name);
+        System.err.println("couldn't load in action "+class_name);
         e.printStackTrace();
         continue;
         }
-        ac.setConfigVars(this.config);
+        ac.setConfigParams(this.config_params);
         ac.setMessageRouter(this.mr);
         ac.configure();
@@ -86 +86 @@
         
         String map_key = action_name+":"+subname;
-        System.out.println("adding in to xslt map, "+map_key+"->"+subxslt);
+        ///ystem.out.println("adding in to xslt map, "+map_key+"->"+subxslt);
         this.xslt_map.put(map_key, subxslt);
         }
@@ -92 +92 @@
        
     }
-
+    
     return true;
     }
@@ -107 +107 @@
     }
     
-    /** adds in the config stuff and interface display stuff - 
-     * needed by the xslt
-     */
-    protected void addExtraInfo(Element page) {
-    Element page_extra = this.doc.createElement(GSXML.PAGE_EXTRA_ELEM);
-    page.appendChild(page_extra);
-    String lang = ((Element)GSXML.getChildByTagName(page, GSXML.PAGE_REQUEST_ELEM)).getAttribute(GSXML.LANG_ATT);
-    Element display = getDisplayElement(lang);
-    page_extra.appendChild(this.doc.importNode(display, true));
-    page_extra.appendChild(this.doc.importNode(this.config.config_xml_, true));
-    
-    return;
-    }
+    /** overwrite this to add any extra info that might be needed in the page before transformation */
+    protected void addExtraInfo(Element page) {}
 
-    /** transform teh page using xslt
-     * we need to get any format element out of teh page and add it to the xslt
+    /** transform the page using xslt
+     * we need to get any format element out of the page and add it to the xslt
      * before transforming */
     protected Element transformPage(Element page) {
@@ -144 +133 @@
         
         // need to transform the format info
-        String stylesheet_file = GSFile.stylesheetFile(this.config, "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));
-        Element new_format = (Element)this.transformer.transform(stylesheet, format_elem);
+        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);
         // add it in to the main stylesheet
         GSXSLT.mergeStylesheets(style_doc, new_format);
-        //System.out.println("the converted stylesheet is:");
-        //System.out.println(this.converter.getPrettyString(style_doc.getDocumentElement()));
+        ///ystem.out.println("the converted stylesheet is:");
+        ///ystem.out.println(this.converter.getPrettyString(style_doc.getDocumentElement()));
     }
     
-    GSXSLT.absoluteIncludePaths(style_doc, this.config);
-    return (Element)this.transformer.transform(style_doc, page);          
+    // 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));
+    // 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();
+    doc.appendChild(doc.importNode(page, true));
+    return (Element)this.transformer.transform(style_doc, doc, config_params);          
     }
 
@@ -169 +164 @@
     }
     // now find the absolute path
-    String stylesheet = GSFile.stylesheetFile(this.config, 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), name);
     if (stylesheet==null) {
         System.out.println("cant find stylesheet for "+name);
@@ -183 +178 @@
     Element display = this.doc.createElement(GSXML.DISPLAY_ELEM);
     // looks for properties files based on interface name
-    String resource_name = "interface_"+this.config.interface_name_;
+    String resource_name = "interface_"+ (String)this.config_params.get(GSConstants.INTERFACE_NAME);
 
     Dictionary dict = new Dictionary(resource_name, lang);