Changeset 4700

Timestamp:

2003-06-18T11:49:19+12:00 (21 years ago)

Author:

kjdon

Message:

no longer use ConfigVars, so methods that used that no take all teh needed arguments individually

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSFile.java (modified) (3 diffs)

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

@@ -155 +155 @@
      *
      * this is not so good because sites may be on a different computer */
-    static public String stylesheetFile(ConfigVars config, String filename) {
+    static public String stylesheetFile(String gsdl3_home,
+                    String site_name,
+                    String interface_name,
+                    String filename) {
     // try site one first
-    String site_home = siteHome(config.gsdl3_home_, config.site_name_);
+    String site_home = siteHome(gsdl3_home, site_name);
     File stylesheet = new File(site_home +File.separatorChar+
                    "transform"+File.separatorChar+filename);
@@ -164 +167 @@
     }
     // try current interface
-    String interface_home = interfaceHome(config.gsdl3_home_, 
-                          config.interface_name_);
+    String interface_home = interfaceHome(gsdl3_home, 
+                          interface_name);
     stylesheet = new File(interface_home+File.separatorChar+
                   "transform"+File.separatorChar+filename);
@@ -172 +175 @@
     }
     // try default interface
-    interface_home = interfaceHome(config.gsdl3_home_, "default");
+    interface_home = interfaceHome(gsdl3_home, "default");
     stylesheet = new File(interface_home+File.separatorChar+
                   "transform"+File.separatorChar+filename);