Show
Ignore:
Timestamp:
27.08.2011 19:25:02 (8 years ago)
Author:
ak19
Message:

Still part of the changes for introducing the --mode=gli flag that's passed to the GS2 server so that we can merge the two cfg files glisite and llssite. 1. Bugfix: need to trim the mode parameter read in the from the file, because some whitespace was left at the end of it. 2. Now the url property in the config file is also to be prefixed with the mode, so that GLI's LocalLibraryServer? can work out whether GLI launched the GSI or whether it was launched independently (outside GLI).

Location:
main/trunk/greenstone2/runtime-src/src/w32server
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/w32server/fnord.cpp

    r24498 r24504  
    970970    // if the server is launched from GLI, the mode_prefix is "gli" and needs 
    971971    // '.' suffixed when accessing certain properties from the config file.      
    972     gsdl_mode_property_prefix = mode + "."; 
     972    gsdl_mode_property_prefix = trim(mode) + "."; 
    973973  } 
    974974  
  • main/trunk/greenstone2/runtime-src/src/w32server/settings.cpp

    r24498 r24504  
    300300      // server first starts up, it's then called without url set as 
    301301      // the server shuts down. 
    302       write_ini_line(fout, "url", url);       
     302      write_ini_line(fout, gsdl_mode_property_prefix+"url", url);       
    303303    } 
    304304