Changeset 18356 for gli/branches/rtl-gli/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java

Timestamp:

2009-01-12T11:18:06+13:00 (15 years ago)

Author:

kjdon

Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318

File:

• gli/branches/rtl-gli/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java (modified) (4 diffs)

gli/branches/rtl-gli/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!");
         }
     }