Changeset 18969 for greenstone3/trunk/src/java/org/greenstone/server/BaseServerSettings.java

Timestamp:

2009-04-15T14:53:44+12:00 (15 years ago)

Author:

ak19

Message:

Updated several files so that the Server2 code in server.jar interacts with GLI code so that the local GS2 server for Linux works the same way as the GS2 Local Library Server on windows

File:

• greenstone3/trunk/src/java/org/greenstone/server/BaseServerSettings.java (modified) (3 diffs)

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

@@ -60 +60 @@
     }
 
-    String auto_start_str = server.config_properties.getProperty(BaseServer.Property.AUTOSTART);
-    if ((auto_start_str.trim()).equals("true")) {
+    String auto_start_str = server.config_properties.getProperty(BaseServer.Property.AUTOSTART).trim();
+    if (auto_start_str.equals("true") || auto_start_str.equals("1")) {
         this.autoStart = true;
     } else {
@@ -272 +272 @@
         newFileLines = scriptReadWrite.queryReplace(oldFileLines, BaseServer.Property.WEB_PORT, portNum+"");
         
-        String newAutoEnter = (new Boolean(autoEnter.isSelected())).toString();
-        newFileLines = scriptReadWrite.queryReplace(newFileLines, BaseServer.Property.AUTOSTART, newAutoEnter);
-        
         // call the subclass' save() method to save custom elements
         save(scriptReadWrite, newFileLines);
@@ -287 +284 @@
                          newFileLines);
         server.reloadConfigProperties();
+        server.reload(); // work out the URL again in case it has changed
         if (require_restart){
             JOptionPane.showMessageDialog(null,server.dictionary.get("ServerSetting.SettingChanged"),"Info", JOptionPane.INFORMATION_MESSAGE);
+            if(autoStart) {
+            server.autoStart();
+            server.getServerControl().updateControl();
+            }
         }
         }