Changeset 24504 for main/trunk/greenstone2/runtime-src

Timestamp:

2011-08-27T19:25:02+12:00 (13 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:

• fnord.cpp (modified) (1 diff)
• settings.cpp (modified) (1 diff)

main/trunk/greenstone2/runtime-src/src/w32server/fnord.cpp

@@ -970 +970 @@
     // if the server is launched from GLI, the mode_prefix is "gli" and needs
     // '.' suffixed when accessing certain properties from the config file.     
-    gsdl_mode_property_prefix = mode + ".";
+    gsdl_mode_property_prefix = trim(mode) + ".";
   }
  

main/trunk/greenstone2/runtime-src/src/w32server/settings.cpp

@@ -300 +300 @@
       // server first starts up, it's then called without url set as
       // the server shuts down.
-      write_ini_line(fout, "url", url);      
+      write_ini_line(fout, gsdl_mode_property_prefix+"url", url);      
     }