Changeset 8231 for trunk/gli/src/org/greenstone/gatherer/util

Timestamp:

2004-10-07T16:44:32+13:00 (20 years ago)

Author:

mdewsnip

Message:

Replaced all "Gatherer.config" with "Configuration".

File:

• trunk/gli/src/org/greenstone/gatherer/util/Utility.java (modified) (7 diffs)

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -46 +46 @@
 import org.apache.xerces.parsers.*;
 import org.apache.xml.serialize.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -498 +499 @@
 
     if (Gatherer.GS3) {
-        this_col_dir = getCollectionDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name, col_name);
+        this_col_dir = getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, col_name);
     } else {
-        this_col_dir = getCollectionDir(Gatherer.config.gsdl_path, col_name);
+        this_col_dir = getCollectionDir(Configuration.gsdl_path, col_name);
         
     }
@@ -584 +585 @@
     static public String getHelpFolder() {
 
-    String help_folder = "help/" + Gatherer.config.getLanguage() + "/";
+    String help_folder = "help/" + Configuration.getLanguage() + "/";
 
     // Try in the JAR/classes directory first
@@ -813 +814 @@
             
         // set up output stream for zip download
-        String col_dir = Utility.getCollectDir(Gatherer.config.gsdl_path);
+        String col_dir = Utility.getCollectDir(Configuration.gsdl_path);
         String zip_fname = col_dir + col_name + ".zip";
         FileOutputStream zip_fos = new FileOutputStream(zip_fname);
@@ -842 +843 @@
     final int maxBufferSize = 1024;
 
-    String col_dir = Utility.getCollectDir(Gatherer.config.gsdl_path);
+    String col_dir = Utility.getCollectDir(Configuration.gsdl_path);
     String zip_fname = col_dir + col_name + ".zip";
     String upload_cgi = Gatherer.cgiBase + "upload";
@@ -1027 +1028 @@
     static public void zipup(String col_name, String dir_or_file)
     {
-    String col_dir = Utility.getCollectDir(Gatherer.config.gsdl_path);
+    String col_dir = Utility.getCollectDir(Configuration.gsdl_path);
     int prefix_strip = col_dir.length();
 
@@ -1080 +1081 @@
     static public void unzip(String col_name)
     {
-    String col_dir = Utility.getCollectDir(Gatherer.config.gsdl_path);
+    String col_dir = Utility.getCollectDir(Configuration.gsdl_path);
     String zip_fname = col_dir + col_name + ".zip";
     int zip_mode = ZipFile.OPEN_READ | ZipFile.OPEN_DELETE;