Changeset 22770

Timestamp:

2010-08-24T19:46:29+12:00 (14 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:

• common-src/src/lib/cfgread.cpp (modified) (1 diff)
• runtime-src/src/w32server/settings.cpp (modified) (1 diff)

main/trunk/greenstone2/common-src/src/lib/cfgread.cpp

@@ -44 +44 @@
   int foundeq = 0;
   while (!filein.eof() && c != '\n') {
-    if (!foundeq && c == '=') {foundeq = 1; filein.get(c);}
-
+    if (!foundeq && c == '=') {
+        foundeq = 1;
+        filein.get(c);
+        // now that we've read the next character, we should check it's not \n
+        // if it is, then we had a line of the form 'hostIP=', and we should exit the loop
+        if (c == '\n') break;       
+    }
     if (foundeq) value.push_back(c);
     else key.push_back(c);

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

@@ -438 +438 @@
     while (read_ini_line(conf, key, value) >= 0) {
       if (key.empty()) continue;
-      if (value.empty()) {
+      if (value.empty() && starts_with(key, "[") && ends_with(key, "]")) {
     // should be a section title
     section = key;