Changeset 22770

Show
Ignore:
Timestamp:
24.08.2010 19:46:29 (9 years ago)
Author:
ak19
Message:

More changes for ticket 152: making the collectdir moveable. When using server.exe, if GLI was last shutdown when another collectdir was active, this needs to be read in from the user config.xml by GLI, and server.exe needs to use it.

Location:
main/trunk/greenstone2
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/src/lib/cfgread.cpp

    r20710 r22770  
    4444  int foundeq = 0; 
    4545  while (!filein.eof() && c != '\n') { 
    46     if (!foundeq && c == '=') {foundeq = 1; filein.get(c);} 
    47  
     46    if (!foundeq && c == '=') { 
     47        foundeq = 1; 
     48        filein.get(c); 
     49        // now that we've read the next character, we should check it's not \n 
     50        // if it is, then we had a line of the form 'hostIP=', and we should exit the loop 
     51        if (c == '\n') break;        
     52    } 
    4853    if (foundeq) value.push_back(c); 
    4954    else key.push_back(c); 
  • main/trunk/greenstone2/runtime-src/src/w32server/settings.cpp

    r20949 r22770  
    438438    while (read_ini_line(conf, key, value) >= 0) { 
    439439      if (key.empty()) continue; 
    440       if (value.empty()) { 
     440      if (value.empty() && starts_with(key, "[") && ends_with(key, "]")) { 
    441441    // should be a section title 
    442442    section = key;