Changeset 4332

Timestamp:

2003-05-26T16:22:56+12:00 (21 years ago)

Author:

jmt12

Message:

bug fix - John

File:

• trunk/gli/src/org/greenstone/gatherer/util/GSDLSiteConfig.java (modified) (6 diffs)

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

@@ -2 +2 @@
 
 import java.io.*;
-import java.util.LinkedHashMap;
+import java.util.*;
 
 public class GSDLSiteConfig
@@ -12 +12 @@
      static final private String ENTERLIB = "enterlib";
      static final private String FALSE = "0";
+     static final private String GSDL = "gsdl";
      static final private String GSDLSITE_CFG = "gsdlsite.cfg";
      static final private String PORTNUMBER = "portnumber";
@@ -18 +19 @@
      static final private String URL = "url";
      public GSDLSiteConfig(File server_exe) {
+         System.err.println("New GSDLSiteConfig for: " + server_exe.getAbsolutePath());
           gsdlsite_cfg = new File(server_exe.getParentFile(), GSDLSITE_CFG);
 
           autoenter_initial = null;
           load();
-          if(autoenter_initial == null) {
-                autoenter_initial = get(AUTOENTER);
-          }
-          put(AUTOENTER, TRUE);
-          save();
+     }
+
+     public boolean exists() {
+          return gsdlsite_cfg.exists();
      }
 
      public String getURL() {
           // URL is made from url and portnumber
-          String url = get(URL);
+          String url = (String) get(URL);
           if(url != null) {
                 StringBuffer temp = new StringBuffer(url);
                 temp.append(COLON);
-                temp.append(get(PORTNUMBER));
-                temp.append(SEPARATOR);
-                temp.append(ENTERLIB);
+                temp.append((String)get(PORTNUMBER));
+                String enterlib = (String)get(ENTERLIB);
+                if(enterlib == null || enterlib.length() == 0) {
+                    // Use the default /gsdl and hope for the best.
+                    temp.append(SEPARATOR);
+                    temp.append(GSDL);
+                }
+                else {
+                    if(!enterlib.startsWith(SEPARATOR)) {
+                        temp.append(SEPARATOR);
+                    }
+                    temp.append(enterlib);
+                }
+                enterlib = null;
                 url = temp.toString();
           }
+          System.err.println("Found Local Library Address: " + url);
           return url;
      }
 
      public void load() {
+            System.err.println("Load: " + gsdlsite_cfg.getAbsolutePath());
           clear();
           try {
@@ -68 +82 @@
 
      /** Restore the autoenter value to its initial value, and remove url if present. */
-     public void restore() {
+     public void restoreAutoEnter() {
+         System.err.println("Restore AutoEnter");
           put(AUTOENTER, autoenter_initial);
           remove(URL);
@@ -74 +89 @@
      }
 
+     public void setAutoEnter() {
+         System.err.println("Set AutoEnter.");
+          if(autoenter_initial == null) {
+                autoenter_initial = (String) get(AUTOENTER);
+                System.err.println("Remember autoenter was: " + autoenter_initial);
+          }
+          put(AUTOENTER, TRUE);
+          save();
+     }
+
      private void save() {
+         System.err.println("Save: " + gsdlsite_cfg.getAbsolutePath());
           try {
                 BufferedWriter out = new BufferedWriter(new FileWriter(gsdlsite_cfg, false));
                 for(Iterator keys = keySet().iterator(); keys.hasNext(); ) {
                      String key = (String) keys.next();
-                     String value = get(key);
+                     String value = (String) get(key);
+                     out.write(key, 0, key.length());
                      if(value != null) {
-                          
-                     }
-                     else {
-
+                          out.write('=');
+                          out.write(value, 0, value.length());
                      }
                      out.newLine();
@@ -96 +121 @@
      }
 }
+
+
+
+
+