Changeset 20480 for gli

Timestamp:

2009-09-02T13:45:08+12:00 (15 years ago)

Author:

ak19

Message:

Changes made to incorporate the Local Apache Library Server on Windows. Needs to be retested on Linux to make sure things still work there.

File:

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

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

@@ -63 +63 @@
     // but the Apache webserver is not persistent by default.
     // Change the initialisation of this value depending on whether fastcgi is 
-    // on. At the moment, this does not apply to the Linux' local library server.
-    static private boolean isPersistentServer = Utility.isWindows();
+    // on. At the moment, this does not apply to the Apache local library server.
+    static private boolean isPersistentServer = false;
 
     static public void addCollection(String collection_name)
@@ -114 +114 @@
     }
 
-    // Used to send messages to the local server on Linux
+    // Used to send messages to the local library server wrapper to the Apache web server (server.jar)
     static private boolean sendMessageToServer(String message) {
-    if(Utility.isWindows()) {
+    if(isPersistentServer) {
         return false;
     }
@@ -164 +164 @@
     static public boolean start(String gsdl_path, String local_library_server_file_path)
     {
-    // 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()) {
-        DebugStream.println("The web server does not exist at " 
-                    + localLinuxServerFolder.getAbsolutePath() + "\nNo local library at all. Trying web library");
-        return false;
-        }
-    }
-
     // Check the local library server file (server.exe or gs2-server.sh) exists
     if(local_library_server_file_path == null) {
         return false;
     }
-    local_library_server_file = new File(local_library_server_file_path);   
-    if (!local_library_server_file.exists()) {
+    local_library_server_file = new File(local_library_server_file_path);
+    if (local_library_server_file.exists()) {
+        if(local_library_server_file.getName().equals("server.exe")) {
+        isPersistentServer = true;
+        } // else it may be gs2-server.bat
+    }
+    else { // local_library_server_file does not exist
         DebugStream.println("No local library at given file path.");
-    
-        String defaultServerFilename = Utility.isWindows() ? "server.exe" : "gs2-server.sh";
-        local_library_server_file = new File(gsdl_path + defaultServerFilename);
-        if (!local_library_server_file.exists()) {
-        DebugStream.println("No local library at all.");
+
+        if(Utility.isWindows()) { // test for server.exe and gs2-server.bat
+        local_library_server_file = new File(gsdl_path + "server.exe");
+        if (local_library_server_file.exists()) {
+            isPersistentServer = true;
+        } else {
+            local_library_server_file = new File(gsdl_path + "gs2-server.bat");
+            if (!local_library_server_file.exists()) {
+            DebugStream.println("No local library at all.");
+            return false;
+            }
+        }       
+        } else { // linux
+        local_library_server_file = new File(gsdl_path + "gs2-server.sh");
+        if (!local_library_server_file.exists()) {
+            DebugStream.println("No local library at all.");
+            return false;
+        }
+        }
+    }   
+
+    if(!isPersistentServer) {
+        // In the case of the Local Library Server on Linux or on Win where there's no server.exe, 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.
+
+        File localServerFolder = new File(gsdl_path, "apache-httpd");
+        if (!localServerFolder.exists() && !localServerFolder.isDirectory()) {
+        DebugStream.println("The web server does not exist at " 
+                + localServerFolder.getAbsolutePath() + "\nNo local library at all. Trying web library");
         return false;
-        }
-    }   
+        } // else apache-httpd folder exists
+    }
 
     llssite_cfg_file = new LLSSiteConfig(local_library_server_file);
@@ -214 +232 @@
     // Spawn local library server process
     String local_library_server_command = local_library_server_file.getAbsolutePath() + getExtraLaunchArguments(llssite_cfg_file);
+    if(Utility.isWindows()) {
+        local_library_server_command = "cmd.exe /c start \"GSI\" " + local_library_server_command;
+    }
 
     // Check if the server is already running
@@ -242 +263 @@
     // Wait until program has started
     try {
-        testServerRunning(); // will set running = true when the server is up and running successfully      
+        //System.err.println("**** testing server...");
+        testServerRunning(); // will set running = true when the server is up and running successfully
+        //System.err.println("**** Is server running: " + running);
     } catch (IOException bad_url_connection) {
         try {
@@ -324 +347 @@
     String args = " " + site_cfg_file.getSiteConfigFilename();
 
-    if(Utility.isWindows()) {
+    if(isPersistentServer) {
         return args;
     }
     
-    // Else, when running the Local Library Server on Linux, need to provide a port argument
+    // Else, when running the Local Apache Library Server on Linux/Win, need to provide a port argument
     try {
         PortFinder portFinder = new PortFinder(50100, 100);
@@ -349 +372 @@
     while (llssite_cfg_file.getURL() == null) {
         new OneSecondWait();  // Wait one second (give or take)
+        //System.err.println("**** One Second Wait");
         llssite_cfg_file.load(false);
         attempt_count++;
@@ -388 +412 @@
      * in an independently launched GSI (one not launched by GLI). */
     static public boolean isURLPending() {
-    /*if(Configuration.library_url != null) {
-        System.err.println("**** Configuration.library_url: " + Configuration.library_url );
-        return false; // don't need to do anything as we already have the url
-        }*/
+    //if(Configuration.library_url != null) {
+    //System.err.println("**** Configuration.library_url: " + Configuration.library_url );
+    //return false; // don't need to do anything as we already have the url
+    //}
 
     llssite_cfg_file.load(true); // don't force reload, load only if modified
@@ -462 +486 @@
         
         // Spawn local library server process
+        running = false;
         String local_library_server_command = local_library_server_file.getAbsolutePath() + getExtraLaunchArguments(llssite_cfg_file);
-        running = false;
+        if(Utility.isWindows()) {
+            local_library_server_command = "cmd.exe /c start \"GSI\" " + local_library_server_command;
+        }
         Gatherer.spawnApplication(local_library_server_command, ID);
         try {
@@ -648 +675 @@
         }
 
-        if(!Utility.isWindows()) {
+        if(!isPersistentServer) {
         return url;
         }