Changeset 24508

Show
Ignore:
Timestamp:
27.08.2011 20:54:15 (7 years ago)
Author:
ak19
Message:

All comments referring to glisite.cfg edited to refer to llssite.cfg alone as necessary

Location:
main/trunk
Files:
3 modified

Legend:

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

    r24505 r24508  
    593593        return false; // don't need to launch the server, one has been independently launched 
    594594        } else { 
    595         // else we try using the glisite configfile 
     595        // else we try using the "gli." prefix to access the url property in the config file 
    596596        llssite_cfg_file.useGLImode(); 
    597597            //llssite_cfg_file.set(); 
     
    703703            // first test if server was started independently of GLI 
    704704            // if so, the config file we'd be using would be llssite.cfg 
    705             if(!usingGSImode()) { // if we were using llssite_cfg, this would have loaded it in 
    706                 // else we try using the glisite configfile 
     705            if(!usingGSImode()) { // this step will try to access the url and other  
     706                // special properties in the config file using the "gli." prefix. 
    707707                useGLImode(); 
    708708            } 
     
    734734            // dir because the non-standard collectDir didn't exist/wasn't specified in the GLI config 
    735735            // file, then write out the new collectDir (minus file separator at end) to the lls site conf in use 
    736             // Regardless of what collecthome value was in the llssite/glisite file, we end up resetting it here 
     736            // Regardless of what collecthome value was in the llssite file, we end up resetting it here 
    737737            if (isPersistentServer) { // server.exe, so we're dealing with a local GS2           
    738738                put(COLLECTHOME, collectDir); 
     
    743743    } 
    744744 
    745     /** Tries to get a glisite.cfg file and then loads it, setting it as the configFile */ 
     745    /** Changes the mode to GLI mode (since GSI was not launched independently but by GLI): in this 
     746    * mode, the "gli." prefix is used to access GLI specific properties from the config file */ 
    746747    public void useGLImode() 
    747748    { 
     
    755756     * (in which case the server URL would be URL_PENDING). 
    756757     * This method returns true if the server interface has already started 
    757      * and, if so, it would have loaded in the llssite_cfg configFile. 
     758     * and, if so, it would have loaded in the configFile. It sets the mode to  
     759     * GSI Mode (meaning GSI was launched independently): no prefix is used to  
     760     * access properties from the config file. 
    758761     */ 
    759762    public boolean usingGSImode() { 
     
    807810 
    808811    /** @return the cmd-line parameter for the configfile used to launch 
    809      * the server through GLI: --config <glisite.cfg/llssite.cfg file path>. */ 
     812     * the server through GLI: --config=<llssite.cfg file path>. */ 
    810813    public String getSiteConfigFilename() { 
    811814        return SPECIFIC_CONFIG + configFile.getAbsolutePath(); 
  • main/trunk/greenstone2/gs2-web-server.bat

    r24492 r24508  
    190190 
    191191:: GLI launches gs2-server.bat with: 
    192 :: cmd /c start "window" "c:\path to\gs2-web-server.bat" --config=c:\path to\glisite.cfg --quit=portnum --mode=gli 
     192:: cmd /c start "window" "c:\path to\gs2-web-server.bat" --config=c:\path to\llssite.cfg --quit=portnum --mode=gli 
    193193:: where the --options are generally optional, but always used for GLI. 
    194194:: The configfile param could contain spaces, in which case its space-separated parts spread over  
    195195:: multiple parameters. In the past, we used to handle this problem here.  
    196196:: At present we pass all the arguments as-is to the Server.jar program and let it handle the parameters. 
    197 :: E.g. gs2-web-server.bat --config=C:\pinky was\here at greenstone2\glisite.cfg --mode=gli --quitport=50100 
    198 :: or gs2-web-server.bat --quitport=50100 --config=C:\pinky was\here at greenstone2\glisite.cfg --mode=gli 
     197:: E.g. gs2-web-server.bat --config=C:\pinky was\here at greenstone2\llssite.cfg --mode=gli --quitport=50100 
     198:: or gs2-web-server.bat --quitport=50100 --config=C:\pinky was\here at greenstone2\llssite.cfg --mode=gli 
    199199:: Note the (lack of) use of quotes! 
    200200 
  • main/trunk/greenstone2/runtime-src/src/w32server/cgiwrapper.cpp

    r24017 r24508  
    484484   
    485485    // First volume gsdlhome's 
    486     // read in all the collections from sections other than [gsdl] in the site config file (llssite/glisite) 
     486    // read in all the collections from sections other than [gsdl] in the site config file (llssite.cfg) 
    487487    colinfo_tmap::const_iterator this_info = gsdl_collectinfo.begin(); 
    488488    colinfo_tmap::const_iterator end_info = gsdl_collectinfo.end(); 
     
    499499    } 
    500500     
    501     // if non-standard collecthome under [gsdl] section of site config file (llssite or glisite), 
     501    // if non-standard collecthome under [gsdl] section of site config file (llssite.cfg), 
    502502    // then need to read in all the collections from this collecthome 
    503503    if(gsdl_collecthome != filename_cat(gsdl_gsdlhome,"collect")) {