Changeset 20911

Timestamp:

2009-11-05T15:14:05+13:00 (14 years ago)

Author:

ak19

Message:

Made a change that I think will help do a configure-web on Windows where the GSDLHOME path contains spaces.

File:

• greenstone3/trunk/src/java/org/greenstone/server/Server2.java (modified) (2 diffs)

greenstone3/trunk/src/java/org/greenstone/server/Server2.java

@@ -83 +83 @@
     server_control_ = new Server2Control(this,frame_title);
 
-    /* Make command tagets for managing Web server */
+    /* Make command targets for managing Web server */
     START_CMD     = "web-start";
     RESTART_CMD   = "web-restart";
-    CONFIGURE_CMD = "configure-web " + configfile;
+    CONFIGURE_CMD = "configure-web \"" + configfile + "\"";
     STOP_CMD      = "web-stop";
 
@@ -378 +378 @@
     String lang = (args.length>=2) ? args[1] : "en";
     
-    // if no config file is given, then the following defaults to llssite.cfg
-    String configfile = (args.length>=3 && args[2].startsWith("--config=")) ? args[2] : gsdl2_home+File.separator+"llssite.cfg";
+    // if no config file is given, then it defaults to llssite.cfg (embedded in quotes to preserve spaces in the filepath)
+    File defaultConfigFile = new File(gsdl2_dir, "llssite.cfg");
+    String configfile = (args.length>=3 && args[2].startsWith("--config=")) ? args[2] : defaultConfigFile.getAbsolutePath();
+        //"\""+defaultConfigFile.getAbsolutePath()+"\"";
+        //"\""+gsdl2_home+File.separator+"llssite.cfg\"";
+    gsdl2_dir = null;
+    defaultConfigFile = null;
+
     int equalSign = configfile.indexOf('=');
     if(equalSign != -1) {