Changeset 19194

Timestamp:

2009-04-22T13:56:44+12:00 (15 years ago)

Author:

ak19

Message:

Deals with the Linux case where the GS2 was not configured with apache-httpd (hence no physical local webserver) but where the gs2-server.sh file exists. In this case, the LocalLibraryServer.start() method first tests whether the apache-httpd directory exists before assuming the local lib server context. This minor change fixes a silent wait error on launching a local gli when the gs2-server.sh file has NOT been renamed and yet the GS2 install was not configured on install with enable-apache-httpd.

File:

• gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java (modified) (1 diff)

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

@@ -166 +166 @@
         return;
         }
-    }
+    }   
+
+    // In the case of the Local Library Server on Linux, we need to do an extra test:
+    // If GS2 was not configured with --enable-apache-httpd, then there is no apache webserver folder,
+    // even though the gs2-server.sh file would still be there. That means if the folder is absent 
+    // we still have no local library server.
+    if(!Utility.isWindows()) {
+        File localLinuxServerFolder = new File(gsdl_path, "apache-httpd");
+        if (!localLinuxServerFolder.exists() && !localLinuxServerFolder.isDirectory()) {
+        System.err.println("The web server does not exist at " 
+                   + localLinuxServerFolder.getAbsolutePath() + "\nNo local library at all. Trying web library");
+        DebugStream.println("The web server does not exist at " 
+                    + localLinuxServerFolder.getAbsolutePath() + "\nNo local library at all. Trying web library");
+        return;
+        }
+    }
+
     llssite_cfg_file = new LLSSiteConfig(local_library_server_file);