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

Timestamp:

2011-02-15T19:23:25+13:00 (13 years ago)

Author:

ak19

Message:

Fix to server-crashing bug where, when loading the titles classifier, a Title's contents were mistaken for metadata since it contained an open square bracket. The code now is a bit more resilient as it checks for the presence of an open square bracket and close square bracket (in that order) before assuming it is format-related Metadata.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/formattools.cpp (modified) (1 diff)

main/trunk/greenstone2/runtime-src/src/recpt/formattools.cpp

@@ -1748 +1748 @@
   text_t::const_iterator here = text.begin();
   text_t::const_iterator end = text.end();
+
+  char startbracket = '[';
+  char endbracket = ']';
+
+  char bracket = startbracket;
   while (here != end) {
-    if (*here == '[') return true;
+      if (*here == bracket) {
+          if(bracket == startbracket) { 
+              // seen a [, next look for a ] to confirm it's metadata
+              bracket = endbracket; 
+          } else if(bracket == endbracket) { 
+              // found [ ... ] in text, so we think it includes metadata
+              return true;
+          }
+      }
     ++here;
   }