Changeset 24465 for main/trunk

Timestamp:

2011-08-24T16:52:43+12:00 (13 years ago)

Author:

ak19

Message:

Server2 now takes an additional parameter -mode, which can be 'gli' and represents the property prefix to use when looking for autoenter and start_browser properties in the config file. The way the arguments to Server2 are processed has also been changed, so that it is no longer dependent on order.

Location:

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

Files:

• Server2.java (modified) (4 diffs)
• Server2Property.java (modified) (1 diff)

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

@@ -31 +31 @@
 {
     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";
-
+    private static final String URL_PENDING="URL_pending";  
+    
     protected String libraryURL;
-
+    
     private class QuitListener extends Thread 
     {
@@ -103 +103 @@
 
 
-    public Server2(String gsdl2_home, String lang, String configfile, int quitPort)
+    public Server2(String gsdl2_home, String lang, String configfile, int quitPort, String property_prefix)
     {
     super(gsdl2_home, lang, configfile, "etc"+File.separator+"logs-gsi");   
-                   // configfile can be either glisite.cfg or llssite.cfg
-
-    Property = new Server2Property();
+                   // configfile can be either glisite.cfg or llssite.cfg   
+
+    //logger_.error("gsdlhome: " + gsdl2_home + " | lang: " + lang + " | configfile: " 
+        //+ configfile + " | mode: " + property_prefix + " | quitport: " + quitPort);
+    
+    // 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    
+    if(!property_prefix.equals("") && !property_prefix.endsWith(".")) { // ensure a '.' is suffixed if non-empty
+        property_prefix += ".";
+    }
+    Property = new Server2Property(property_prefix);
+    
     
     String frame_title = dictionary.get("ServerControl.Frame_Title");
@@ -422 +431 @@
     public static void main (String[] args)
     {
-        if ((args.length < 1) || (args.length > 4)) {
+        if ((args.length < 1) || (args.length > 5)) {
         System.err.println(
-           "Usage: java org.greenstone.server.Server2 <gsdl2-home-dir> [lang] [--config=configfile] [--quitport=portNum]");
+           "Usage: java org.greenstone.server.Server2 <gsdl2-home-dir> [lang] [--mode=\"gli\"] [--config=configfile] [--quitport=portNum]");
         System.exit(1);
-    }
+        }
     
     String gsdl2_home = args[0];
@@ -435 +444 @@
     }
     
-    String lang = (args.length>=2) ? args[1] : "en";
-    
+    int index = 1; // move onto any subsequent arguments
+    
+    // defaults for optional arguments
     // 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();
-    gsdl2_dir = null;
-    defaultConfigFile = null;
-
-    int equalSign = configfile.indexOf('=');
-    if(equalSign != -1) {
-        configfile = configfile.substring(equalSign+1);
-    }
-
-    String quitport = (args.length == 4 && args[3].startsWith("--quitport=")) ? args[3] : "";
-    equalSign = quitport.indexOf('=');
+    File defaultConfigFile = new File(gsdl2_dir, "llssite.cfg");    
+    String configfile = defaultConfigFile.getAbsolutePath();
     int port = -1;
-    if(equalSign != -1) {
-        try {
-        quitport = quitport.substring(equalSign+1);
-        port = Integer.parseInt(quitport);
-        } catch(Exception e) { // parse fails
-        System.err.println("Port must be numeric. Continuing without it.");
-        }
-    }
-
-    //System.err.println("Running server with config file: " + configfile);
-    
-    new Server2(gsdl2_home, lang, configfile, port);
+    String mode = "";
+    String lang = "en"; 
+    
+    // cycle through arguments, parsing and storing them
+    while(args.length > index) {
+            
+        if(args[index].startsWith("--config=")) {
+            configfile = args[index].substring(args[index].indexOf('=')+1); // get value after '=' sign         
+            gsdl2_dir = null;
+            defaultConfigFile = null;
+        }
+        
+        else if(args[index].startsWith("--quitport=")) {
+            String quitport = args[index].substring(args[index].indexOf('=')+1);            
+            try {               
+                port = Integer.parseInt(quitport);
+            } catch(Exception e) { // parse fails
+                System.err.println("Port must be numeric. Continuing without it.");
+            }       
+        }
+        
+        // mode can be: "gli" if launched by GLI or unspecified. If unspecified, then 
+        // the gs2-server was launched independently.
+        else if(args[index].startsWith("--mode=")) {
+            mode = args[index].substring(args[index].indexOf('=')+1);
+        }
+        
+        else if(args[index].length() == 2) { 
+            // there is an optional argument, but without a --FLAGNAME= prefix, so it's a language code         
+            lang = args[index];
+        }
+        
+        index++;
+    }
+    
+    new Server2(gsdl2_home, lang, configfile, port, mode);
     }
 }

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

@@ -5 +5 @@
 public class Server2Property extends BaseProperty 
 {
-    Server2Property()
+    Server2Property(String property_prefix)
     {
     // Initialising customised final variables 
     // Version number, WEB_PORT
-    super("2", "portnumber", "autoenter", "start_browser", "keepport");
+    super("2", "portnumber", property_prefix+"autoenter", property_prefix+"start_browser", "keepport");
     }