Changeset 24875

Show
Ignore:
Timestamp:
09.12.2011 18:28:28 (8 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

    r24811 r24875  
    914914            + File.separator + "cgi" + File.separator + "gsdl3site.cfg"; 
    915915        } else { // cgi-bin/gsdlsite.cfg 
    916             return Configuration.gsdl_path /* + File.separator */ 
    917             + "cgi-bin" + File.separator + "gsdlsite.cfg"; 
     916            String gsdlarch = System.getenv("GSDLARCH"); 
     917            if(gsdlarch == null) { 
     918            gsdlarch = ""; 
     919            } 
     920            return Configuration.gsdl_path /* + File.separator */ 
     921            + "cgi-bin" + File.separator + client_operating_system+gsdlarch + File.separator + "gsdlsite.cfg"; 
    918922        } 
    919923    } 
     
    961965             
    962966            // The web server needs to be told where a new (non-standard) collecthome home is. 
    963             // The web server reads collecthome from cgi-bin/gsdlsite.cfg, where the property 
     967            // The web server reads collecthome from cgi-bin/<OS>/gsdlsite.cfg, where the property 
    964968            // collecthome can be specified if a non-standard collecthome is to be used. If no  
    965969            // such property is specified in the file, then it assumes the standard GS collecthome.