Changeset 18136 for gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java

Timestamp:

2008-12-08T13:36:13+13:00 (15 years ago)

Author:

ak19

Message:

Now first checks whether glisite.cfg exists and loads that, if not it looks for gsdlsite.cfg and loads that. Previously it would only look for and try to load gsdlsite.cfg, which meant that it ignored any server configuration values I changed in glisite.cfg (like autoenter and startbrowser).

File:

• gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java (modified) (4 diffs)

gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java

@@ -139 +139 @@
 
     // Configure the server for immediate entry
-    gsdlsite_cfg_file.set();
+    //gsdlsite_cfg_file.set();
 
     // Spawn local library server process
@@ -286 +286 @@
     public GSDLSiteConfig(File server_exe) {
         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);
+
+        File configFile = null;
+        if(glisite_cfg.exists()) {
+        configFile = glisite_cfg;
+        } else if(gsdlsite_cfg.exists()) {
+        configFile = gsdlsite_cfg;
+        } else {
+        debug("Neither the file glisite.cfg nor GSDLsite.cfg can be found!");
+        }
+        
         autoenter_initial = null;
         start_browser_initial = null;
-        if(gsdlsite_cfg.exists()) {
-        debug("Load: " + gsdlsite_cfg.getAbsolutePath());
+        if(configFile != null) {
+        debug("Load: " + configFile.getAbsolutePath());
         clear();
         try {
-            BufferedReader in = new BufferedReader(new FileReader(gsdlsite_cfg));
+            BufferedReader in = new BufferedReader(new FileReader(configFile));
             String line = null;
             while((line = in.readLine()) != null) {
@@ -315 +326 @@
         }
         }
-        else {
-        debug("No GSDLsite.cfg file can be found!");
-        }
-    }
-
+    }
+    
     public boolean exists() {
         return gsdlsite_cfg.exists();
@@ -402 +410 @@
         }
         else {
-        debug("No GSDLsite.cfg file can be found!");
+        debug("No glisite.cfg file can be found!");
         }
     }