Changeset 19543 for greenstone3

Timestamp:

2009-05-20T17:59:26+12:00 (15 years ago)

Author:

ak19

Message:

Adds url=URL_pending into the llssite.cfg/glisite.cfg file if the server has not yet been started. This is then used by GLI's LocalLibraryServer to work out whether it should luanch a GSI itself, or whether one was already inependently launched (from outside of GLI). If the latter case, GLI will use the GSI that's already open. If the server is never started by GSI server, then the URL-pending line that's still in the configFile is removed to restore the default state.

File:

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

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

@@ -23 +23 @@
 {
     private static final int WAITING_TIME = 10; // time to wait and check for whether the server is running
+    private static final String URL_PENDING="URL_pending";
 
     protected String libraryURL;
@@ -100 +101 @@
                 + PortFinder.PORTS_RESERVED + " - " + PortFinder.MAX_PORT + "]" );
         quitPort = -1;
+        }
+    }
+    
+    // If the GSI is set to NOT autoenter/autostart the server, then write url=URL_PENDING out to the file.
+    // When the user finally presses the Enter Library button and so has started up the server, the correct
+    // url will be written out to the configfile.
+    if(config_properties.getProperty(BaseServer.Property.AUTOSTART, "").equals("0")) {//if(configfile.endsWith("llssite.cfg")) {
+        if(config_properties.getProperty("url") == null) {
+        config_properties.setProperty("url", URL_PENDING);
+        ScriptReadWrite scriptReadWrite = new ScriptReadWrite();
+        ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
+        scriptReadWrite.replaceOrAddLine(fileLines, "url", URL_PENDING, true);
+        scriptReadWrite.writeOutFile(config_properties_file, fileLines);
         }
     }
@@ -250 +264 @@
     ScriptReadWrite scriptReadWrite = new ScriptReadWrite();
     ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
-    if (fileLines.contains("url="+getBrowserURL())) {
-        // would be last element, remove it:
-        fileLines.remove(fileLines.size()-1);
+
+    // Remove the url=... line, start searching from the end
+    boolean done = false;
+    for (int i = fileLines.size()-1; i >= 0 && !done; i--) {
+        String line = ((String) fileLines.get(i)).trim();
+        if(line.startsWith("url=")) {
+        fileLines.remove(i);
+        done = true;
+        }
     }
     scriptReadWrite.writeOutFile(config_properties_file, fileLines);
@@ -273 +293 @@
     // 1. Test that the server is running at the libraryURL before writing it out to glisite.cfg/configfile 
     // A quick test involves opening a connection to get the home page for this collection
-    if(libURL != null) {
+    if(libURL != null && !libraryURL.equals(URL_PENDING)) {
 
         boolean ready = false;