fixed a bug in the qualifier parser

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1399 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-core/EOControl/ChangeLog b/sope-core/EOControl/ChangeLog
index d38d293920aed1cb0f313883b23973ae83392113..0810e12589cb2777cd5cda3b0cb2796eea1acd2b 100644 (file)
--- a/sope-core/EOControl/ChangeLog
+++ b/sope-core/EOControl/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-15  Stephane Corthesy  <stephane@sente.ch>
+
+       * EOQualifierParser.m (_parseValue): fixed a bug in the qualifier
+         parser (v4.5.72)
+
 2006-12-17  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * EOKeyValueCoding.m: fixed a runtime portability issue - removed

diff --git a/sope-core/EOControl/EOQualifierParser.m b/sope-core/EOControl/EOQualifierParser.m
index 5f2286709701dd3bf3b63536fc60ac547b4ddd6e..1f803442961d8c6a28c0f67381eebddf502b294a 100644 (file)
--- a/sope-core/EOControl/EOQualifierParser.m
+++ b/sope-core/EOControl/EOQualifierParser.m
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2000-2005 SKYRIX Software AG
+  Copyright (C) 2000-2007 SKYRIX Software AG
+  Copyright (C) 2007      Helge Hess
 
   This file is part of SOPE.
 
@@ -956,9 +957,17 @@ static id _parseValue(id _ctx, const char *_buf, unsigned _bufLen,
        if (rc != 0)
          /* does not match */
          continue;
-       if (!(_buf[pos + toklen] == '\0' || isspace(_buf[pos + toklen])))
-         /* not at the string end or folloed by a space */
+       
+       if (!(_buf[pos + toklen] == '\0' || isspace(_buf[pos + toklen]) ||
+             _buf[pos + toklen] == ')')) {
+         /*
+           Not at the string end or followed by a space or a right 
+           parenthesis. The latter is required to correctly parse this:
+             (not (attribute = nil) and
+               attribute.className = 'com.webobjects.foundation.NSTimestamp')
+         */
          continue;
+       }
 
        /* wow, found the token */
        pos += toklen; /* skip it */

diff --git a/sope-core/EOControl/Version b/sope-core/EOControl/Version
index 1adf4e06004ad49e23a88dea757432a09b345259..c897650b08cc758e1efd972299a63cdc197cde02 100644 (file)
--- a/sope-core/EOControl/Version
+++ b/sope-core/EOControl/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=71
+SUBMINOR_VERSION:=72