Changeset 10293

Timestamp:

2005-07-25T16:12:09+12:00 (19 years ago)

Author:

kjdon

Message:

gsdl3_home now comes from GlobalProperties, not config_params

Location:

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

Files:

• Receptionist.java (modified) (2 diffs)
• TransformingReceptionist.java (modified) (4 diffs)

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

@@ -76 +76 @@
 
     // find the config file containing a list of actions
-    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))));
+    File interface_config_file = new File(GSFile.interfaceConfigFile(GSFile.interfaceHome(GlobalProperties.getGSDL3Home(), (String)this.config_params.get(GSConstants.INTERFACE_NAME))));
     if (!interface_config_file.exists()) {
         System.err.println("Receptionist: interface config file: "+interface_config_file.getPath()+" not found!");
@@ -224 +224 @@
     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)));
+        File base_interface_config_file = new File(GSFile.interfaceConfigFile(GSFile.interfaceHome(GlobalProperties.getGSDL3Home(), base_interface)));
         if (!base_interface_config_file.exists()) {
         System.err.println("Receptionist: base interface config file: "+base_interface_config_file.getPath()+" not found!");

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

@@ -47 +47 @@
     
     // find the config file containing a list of actions
-    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))));
+    File interface_config_file = new File(GSFile.interfaceConfigFile(GSFile.interfaceHome(GlobalProperties.getGSDL3Home(), (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!");
@@ -174 +174 @@
         ///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), collection, (String)this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces,   "config_format.xsl");
+        String stylesheet_file = GSFile.stylesheetFile(GlobalProperties.getGSDL3Home(), (String)this.config_params.get(GSConstants.SITE_NAME), collection, (String)this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces,   "config_format.xsl");
         Document stylesheet_doc = this.converter.getDOM(new File(stylesheet_file));
         if (stylesheet_doc != null) {
@@ -193 +193 @@
     
     // 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), collection, (String)this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces);
+    GSXSLT.absoluteIncludePaths(style_doc, GlobalProperties.getGSDL3Home(), (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();
@@ -213 +213 @@
     }
     // 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), collection, (String)this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces, name);
+    String stylesheet = GSFile.stylesheetFile(GlobalProperties.getGSDL3Home(), (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);