Changeset 4672

Timestamp:

2003-06-16T10:03:28+12:00 (21 years ago)

Author:

jmt12

Message:

Local library stuff - use its own glisite.cfg file

File:

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

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

@@ -12 +12 @@
 
     static final public String ADD_COMMAND = "?a=config&cmd=add-collection&c=";
+    static final public String SPECIFIC_CONFIG = "--config=";
     static final public String RELEASE_COMMAND = "?a=config&cmd=release-collection&c=";
     static final public String QUIT_COMMAND = "?a=config&cmd=kill";
@@ -19 +20 @@
     static final private String ENTERLIB = "enterlib";
     static final private String FALSE = "0";
-    static final private String GLISITE = null ;//"glisite.cfg";
+    static final private String GLISITE_CFG = "glisite.cfg";
     static final private String GSDL = "gsdl";
     static final private String GSDLSITE_CFG = "gsdlsite.cfg";
+    static final private String LOCAL_HOST = "localhost"; 
     static final private String PORTNUMBER = "portnumber";
     static final private String SEPARATOR = "/";
@@ -31 +33 @@
     debug("New GSDLSiteConfig for: " + server_exe.getAbsolutePath());
     gsdlsite_cfg = new File(server_exe.getParentFile(), GSDLSITE_CFG);
-    //glisite_cfg = new File(server_exe.getParentFile(), GLISITE_CFG);
+    glisite_cfg = new File(server_exe.getParentFile(), GLISITE_CFG);
     autoenter_initial = null;
     start_browser_initial = null;
-    load();
-    }
-
-    public boolean exists() {
-    return gsdlsite_cfg.exists();
-    }
-
-    public String getSiteConfigFilename() {
-    //return GLISITE_CFG;
-    return GSDLSITE_CFG;
-    }
-
-    public String getURL() {
-    // URL is made from url and portnumber
-    String url = (String) get(URL);
-    if(url != null) {
-        StringBuffer temp = new StringBuffer(url);
-        temp.append(COLON);
-        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();
-    }
-    debug("Found Local Library Address: " + url);
-    return url;
-    }
-
-    public void load() {
     if(gsdlsite_cfg.exists()) {
         debug("Load: " + gsdlsite_cfg.getAbsolutePath());
@@ -102 +65 @@
     }
 
+    public boolean exists() {
+    return gsdlsite_cfg.exists();
+    }
+
+    public String getLocalHostURL() {
+    StringBuffer url = new StringBuffer(LOCAL_HOST);
+    url.append(COLON);
+    url.append((String)get(PORTNUMBER));
+    String enterlib = (String)get(ENTERLIB);
+    if(enterlib == null || enterlib.length() == 0) {
+        // Use the default /gsdl and hope for the best.
+        url.append(SEPARATOR);
+        url.append(GSDL);
+    }
+    else {
+        if(!enterlib.startsWith(SEPARATOR)) {
+        url.append(SEPARATOR);
+        }
+        url.append(enterlib);
+    }
+    enterlib = null;
+    debug("Found Local Library Address: " + url.toString());
+    return url.toString();
+    }
+
+    public String getSiteConfigFilename() {
+    return SPECIFIC_CONFIG + glisite_cfg.getAbsolutePath();
+    }
+
+    public String getURL() {
+    // URL is made from url and portnumber
+    String url = (String) get(URL);
+    if(url != null) {
+        StringBuffer temp = new StringBuffer(url);
+        temp.append(COLON);
+        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();
+    }
+    debug("Found Local Library Address: " + url);
+    return url;
+    }
+
+    public void load() {
+    if(glisite_cfg.exists()) {
+        debug("Load: " + glisite_cfg.getAbsolutePath());
+        clear();
+        try {
+        BufferedReader in = new BufferedReader(new FileReader(glisite_cfg));
+        String line = null;
+        while((line = in.readLine()) != null) {
+            String key = null;
+            String value = null;
+            int index = -1;
+            if((index = line.indexOf("=")) != -1 && line.length() >= index + 1) {
+            key = line.substring(0, index);
+            value = line.substring(index + 1);
+            }
+            else {
+            key = line;
+            }
+            put(key, value);
+        }
+        }
+        catch (Exception error) {
+        error.printStackTrace();
+        }
+    }
+    else {
+        debug("No GSDLsite.cfg file can be found!");
+    }
+    }
+
     /** Restore the autoenter value to its initial value, and remove url if present. */
     public void restore() {
@@ -137 +185 @@
 
     private void save() {
-    debug("Save: " + gsdlsite_cfg.getAbsolutePath());
-    //debug("Save: " + glisite_cfg.getAbsolutePath());
+    //debug("Save: " + gsdlsite_cfg.getAbsolutePath());
+    debug("Save: " + glisite_cfg.getAbsolutePath());
     try {
-        BufferedWriter out = new BufferedWriter(new FileWriter(gsdlsite_cfg, false));
-        //BufferedWriter out = new BufferedWriter(new FileWriter(glisite_cfg, false));
+        //BufferedWriter out = new BufferedWriter(new FileWriter(gsdlsite_cfg, false));
+        BufferedWriter out = new BufferedWriter(new FileWriter(glisite_cfg, false));
         for(Iterator keys = keySet().iterator(); keys.hasNext(); ) {
         String key = (String) keys.next();