Changeset 24503 for main/trunk

Timestamp:

2011-08-27T19:23:36+12:00 (13 years ago)

Author:

ak19

Message:

Still part of the changes for introducing the --mode=gli flag that's passed to the GS2 server so that we can merge the two cfg files glisite and llssite. Now the url property in the config file is also to be prefixed with the mode, so that GLI's LocalLibraryServer can work out whether GLI launched the GSI or whether it was launched independently (outside GLI).

File:

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

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

@@ -35 +35 @@
     
     protected String libraryURL;
+    protected String property_prefix;
     
     private class QuitListener extends Thread 
@@ -76 +77 @@
                 // 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.
+                String url = property_prefix+"url";
                 if(config_properties.getProperty(BaseServer.Property.AUTOSTART, "").equals("0")) {
-                if(config_properties.getProperty("url") == null) {
-                    config_properties.setProperty("url", URL_PENDING);
+                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.replaceOrAddLine(fileLines, url, URL_PENDING, true);
                     scriptReadWrite.writeOutFile(config_properties_file, fileLines);
                 }
@@ -104 +106 @@
 
 
-    public Server2(String gsdl2_home, String lang, String configfile, int quitPort, String property_prefix)
+    public Server2(String gsdl2_home, String lang, String configfile, int quitPort, String mode)
     {
     super(gsdl2_home, lang, configfile, "etc"+File.separator+"logs-gsi");   
@@ -113 +115 @@
     
     // property_prefix is the mode we're running in (gli or empty) and contains the prefix
-    // string to look for in config file for auto_enter and start_browser properties    
+    // string to look for in config file for auto_enter, start_browser and url properties
+    property_prefix = mode;
     if(!property_prefix.equals("") && !property_prefix.endsWith(".")) { // ensure a '.' is suffixed if non-empty
         property_prefix += ".";
@@ -164 +167 @@
     // 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);
+        String url = property_prefix+"url";
+        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.replaceOrAddLine(fileLines, url, URL_PENDING, true);
         scriptReadWrite.writeOutFile(config_properties_file, fileLines);
         }
@@ -374 +378 @@
     for (int i = fileLines.size()-1; i >= 0 && !done; i--) {
         String line = ((String) fileLines.get(i)).trim();
-        if(line.startsWith("url=")) {
+        if(line.startsWith(property_prefix+"url=")) {
         fileLines.remove(i);
         done = true;
@@ -429 +433 @@
     ScriptReadWrite scriptReadWrite = new ScriptReadWrite();
     ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
-    scriptReadWrite.replaceOrAddLine(fileLines, "url", libraryURL, true);
+    scriptReadWrite.replaceOrAddLine(fileLines, property_prefix+"url", libraryURL, true);
     scriptReadWrite.replaceOrAddLine(fileLines, "portnumber", port, false); // write the correct port
     scriptReadWrite.writeOutFile(config_properties_file, fileLines);