Changeset 21965 for main/trunk

Timestamp:

2010-04-27T14:38:46+12:00 (14 years ago)

Author:

ak19

Message:

Made changes to GLI and gs2-server.bat to allow GLI to deal with spaces in filepath (previously still a problem on Windows when GLI needed to launch gs2-server.bat). The issue was with the windows/batch start command: 1. the way it was launched in GLI and 2. the way windows deals with spaces in the PARAMETERS to the script launched with batch's start cmd. The corresponding changes that needed to be made to deal with these two aspects of the issue are in: gli's greenstone/LocalLibraryServer.java and gs2-sever.bat.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (2 diffs)
• greenstone/LocalLibraryServer.java (modified) (2 diffs)

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

@@ -836 +836 @@
     {
     ExternalApplication app = new ExternalApplication(command, ID);
+    apps.add(app);
+    app.start();
+    }
+
+    static public void spawnApplication(String[] commands, String ID)
+    {
+    ExternalApplication app = new ExternalApplication(commands, ID);
     apps.add(app);
     app.start();
@@ -1131 +1138 @@
         this.ID = ID;
     }
+
+    public ExternalApplication(String[] commands, String ID) {
+        this.commands = commands;
+        this.ID = ID;
+    }
     
     public String getID() { 

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