Changeset 22608 for main/trunk/gli

Timestamp:

2010-08-12T14:17:05+12:00 (14 years ago)

Author:

sjm84

Message:

Added a change to local library server to work with the gs2-server.bat rename to gs2-web-server.bat

File:

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

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

@@ -172 +172 @@
         if(local_library_server_file.getName().equals("server.exe")) {
         isPersistentServer = true;
-        } // else it may be gs2-server.bat
+        } // else it may be gs2-web-server.bat
     }
     else { // local_library_server_file does not exist
         DebugStream.println("No local library at given file path.");
 
-        if(Utility.isWindows()) { // test for server.exe and gs2-server.bat
+        if(Utility.isWindows()) { // test for server.exe and gs2-web-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");
+            local_library_server_file = new File(gsdl_path + "gs2-web-server.bat");
             if (!local_library_server_file.exists()) {
             DebugStream.println("No local library at all.");
@@ -233 +233 @@
     final String QUOTES = Utility.isWindows() ? "\"" : ""; // need to embed path in quotes on Windows for spaces (interferes on Linux)
     String local_library_server_command = QUOTES+local_library_server_file.getAbsolutePath()+QUOTES + getExtraLaunchArguments(llssite_cfg_file);
-    if(Utility.isWindows() && !isPersistentServer) { // launching gs2-server.bat (Windows) needs cmd start
+    if(Utility.isWindows() && !isPersistentServer) { // launching gs2-web-server.bat (Windows) needs cmd start
         local_library_server_command = "cmd.exe /c start \"GSI\" " + local_library_server_command;
     }
@@ -490 +490 @@
         final String QUOTES = Utility.isWindows() ? "\"" : ""; // need to embed path in quotes on Windows for spaces (interferes on Linux)
         String local_library_server_command = QUOTES+local_library_server_file.getAbsolutePath()+QUOTES + getExtraLaunchArguments(llssite_cfg_file);
-        if(Utility.isWindows() && !isPersistentServer) { // launching gs2-server.bat (Windows) needs cmd start
+        if(Utility.isWindows() && !isPersistentServer) { // launching gs2-web-server.bat (Windows) needs cmd start
             local_library_server_command = "cmd.exe /c start \"GSI\" " + local_library_server_command;
         }