Changeset 21998

Timestamp:

2010-04-29T16:40:17+12:00 (14 years ago)

Author:

ak19

Message:

Fix to recent commit: embedding path to server script in quotes broke on Linux. So now we do this only for Windows.

File:

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

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

@@ -231 +231 @@
 
     // Spawn local library server process
-    String local_library_server_command = "\""+local_library_server_file.getAbsolutePath()+"\"" + getExtraLaunchArguments(llssite_cfg_file);
+    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
         local_library_server_command = "cmd.exe /c start \"GSI\" " + local_library_server_command;
@@ -487 +488 @@
         // Spawn local library server process
         running = false;
-        String local_library_server_command = "\""+local_library_server_file.getAbsolutePath()+"\"" + getExtraLaunchArguments(llssite_cfg_file);
+        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
             local_library_server_command = "cmd.exe /c start \"GSI\" " + local_library_server_command;