Changeset 24875 for main/trunk

Timestamp:

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

Author:

ak19

Message:

Fourth 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. This final change is to affected references to cgi-bin in GLI.

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -914 +914 @@
             + File.separator + "cgi" + File.separator + "gsdl3site.cfg";
         } else { // cgi-bin/gsdlsite.cfg
-            return Configuration.gsdl_path /* + File.separator */
-            + "cgi-bin" + File.separator + "gsdlsite.cfg";
+            String gsdlarch = System.getenv("GSDLARCH");
+            if(gsdlarch == null) {
+            gsdlarch = "";
+            }
+            return Configuration.gsdl_path /* + File.separator */
+            + "cgi-bin" + File.separator + client_operating_system+gsdlarch + File.separator + "gsdlsite.cfg";
         }
     }
@@ -961 +965 @@
             
             // The web server needs to be told where a new (non-standard) collecthome home is.
-            // The web server reads collecthome from cgi-bin/gsdlsite.cfg, where the property
+            // The web server reads collecthome from cgi-bin/<OS>/gsdlsite.cfg, where the property
             // collecthome can be specified if a non-standard collecthome is to be used. If no 
             // such property is specified in the file, then it assumes the standard GS collecthome.