Changeset 24876 for main/trunk

Timestamp:

2011-12-09T18:45:24+13:00 (12 years ago)

Author:

ak19

Message:

Fifth set of commits to do with the migration of cgi-bin into common-src, so that upon make install, common-src\cgi-bin will be installed in cgi-bin\GSDLOS(GSDLARCH). The first commit was of changes to files in cgi-bin itself. The second commit was moving cgi-bin. The third one involves changes to all the files in GS2 referring to cgi-bin where this needs to be changed to cgi-bin\OS_and_ARCH. The fourth change is to affected references to cgi-bin in GLI. This (fifth change) is changes to server.jar, where Server2.jar was affected (and which required changes to gs2-webserver.bat and gs2-server.sh)

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;
+    protected String property_prefix;
+    protected String gsdlos_gsdlarch;
     
     private class QuitListener extends Thread 
@@ -106 +107 @@
 
 
-    public Server2(String gsdl2_home, String lang, String configfile, int quitPort, String mode)
+    public Server2(String gsdl2_home, String gsdlos_arch, String lang, String configfile, int quitPort, String mode)
     {
     super(gsdl2_home, lang, configfile, "etc"+File.separator+"logs-gsi");   
@@ -112 +113 @@
 
     //logger_.error("gsdlhome: " + gsdl2_home + " | lang: " + lang + " | configfile: " 
-        //+ configfile + " | mode: " + property_prefix + " | quitport: " + quitPort);
-    
+        //+ configfile + " | gsdlos_gsdlarch: " + gsdlos_arch + " | mode: " + property_prefix + " | quitport: " + quitPort);
+    
+    // to get to the OS specific subdirectory of cgi-bin
+    gsdlos_gsdlarch = gsdlos_arch;
+
     // 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, start_browser and url properties
@@ -248 +252 @@
     // get the prefix from the gsdlsite.cfg and build.properties files (port number and servername)
     try{
-        File gsdlsite_cfg = new File(gsdl_home + File.separator + "cgi-bin" + File.separator + "gsdlsite.cfg");
+        File gsdlsite_cfg = new File(gsdl_home + File.separator + "cgi-bin" + File.separator 
+                     + gsdlos_gsdlarch + File.separator + "gsdlsite.cfg");
         FileInputStream fin = new FileInputStream(gsdlsite_cfg); 
         Properties gsdlProperties = new Properties();
@@ -454 +459 @@
     }
     
+    String gsdlos_arch = args[1];
+
     //for(int i = 0; i < args.length; i++) { System.err.println("Arg[" + i + "]: |" + args[i] + "|");   }
     
     // for every subsequent argument, check whether we're dealing with amalgamated
     // parameters in that argument. If so, split on whitespace and reconstruct arguments
-    for(int i = 1; i < args.length; i++) {
+    for(int i = 2; i < args.length; i++) {
     
         // if the *last* occurrence of a flag parameter is not at the start of 
@@ -493 +500 @@
     String lang = "en";
     
-    int index = 1; // move onto any subsequent arguments (past 1st GSDLHOME arg)
+    int index = 2; // move onto any subsequent arguments (past 1st GSDLHOME arg and 2nd GSDLOS_GSDLARCH arg)
     if (args.length > index && !args[index].startsWith("--")) {
         lang = args[index]; // 2nd arg is not a flag option, so must be language
@@ -535 +542 @@
     //System.err.println("\n\n*******\n\ngsdlhome: " + gsdl2_home + " | lang: " + lang + " |configfile:"
     //  + configfile + "| mode: " + mode + " | quitport: " + port + "\n\n*************\n");
-    new Server2(gsdl2_home, lang, configfile, port, mode);
+    new Server2(gsdl2_home, gsdlos_arch, lang, configfile, port, mode);
     }
 }