allow kvc pathes in rule values

fixed some quote parsing issue

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

diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog
index 216f535e4f6e0b1021e4943c65129ef50b8af9f7..9a29b3c40df900cd46a2c5b83a5183c0213e9fa2 100644 (file)
--- a/sope-core/NGExtensions/ChangeLog
+++ b/sope-core/NGExtensions/ChangeLog
@@ -1,3 +1,12 @@
+2006-11-19  Helge Hess  <helge.hess@opengroupware.org>
+
+       * v4.5.191
+
+       * NGRuleEngine.subproj/NGRuleContext.m: allow keypathes in rule values,
+         not just keys
+
+       * FdExt.subproj/NSString+misc.m: fixed a quote-skipping issue
+
 2006-11-16  Helge Hess  <helge.hess@opengroupware.org>
 
        * EOExt.subproj/EOCacheDataSource.m: the NSTimer of the datasource

diff --git a/sope-core/NGExtensions/FdExt.subproj/NSString+misc.m b/sope-core/NGExtensions/FdExt.subproj/NSString+misc.m
index fcdb4faa9aec6bed2c81012fb211cd511dcdf4cb..f7a6ffa7c08b66818108692de139a62042fef00f 100644 (file)
--- a/sope-core/NGExtensions/FdExt.subproj/NSString+misc.m
+++ b/sope-core/NGExtensions/FdExt.subproj/NSString+misc.m
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2000-2005 SKYRIX Software AG
+  Copyright (C) 2000-2006 SKYRIX Software AG
+  Copyright (C) 2006      Helge Hess
 
   This file is part of SOPE.
 
@@ -262,7 +263,10 @@
     }
     else if ([quotes characterIsMember:c]) {
       /* skip quotes */
-      for (i++; i < len && ![quotes characterIsMember:c]; i++) {
+      i++;
+      c = [self characterAtIndex:i];
+      for (; i < len && ![quotes characterIsMember:c]; i++) {
+       c = [self characterAtIndex:i];
         if (c == _escape) {
           i++; /* skip next char (eg \') */
           continue;

diff --git a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleContext.m b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleContext.m
index 7e38945d4037e43a2f304aadb5644bdbfa4a0c43..c3ef5fcc9d9f996597f7acb8637a8c3df1badfdb 100644 (file)
--- a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleContext.m
+++ b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleContext.m
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2003-2004 SKYRIX Software AG
+  Copyright (C) 2003-2006 SKYRIX Software AG
+  Copyright (C) 2006      Helge Hess
 
   This file is part of SOPE.
 
@@ -187,7 +188,7 @@
     [self takeValue:[_values objectAtIndex:i] forKeyPath:_valkp];
 
     /* calculate the rule value */
-    ruleValue = [self valueForKey:_kp];
+    ruleValue = [self valueForKeyPath:_kp];
     [results addObject:(ruleValue != nil ? ruleValue : (id)[NSNull null])];
   }
   return results;

diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version
index e3c6c10cf3c4027001aac568e2e4e4c208deddad..25359895d5d230aab6d8fdcc2f73045feb9b02c6 100644 (file)
--- a/sope-core/NGExtensions/Version
+++ b/sope-core/NGExtensions/Version
@@ -1,6 +1,6 @@
 # version
 
-SUBMINOR_VERSION:=190
+SUBMINOR_VERSION:=191
 
 # v4.3.115 requires libFoundation v1.0.59
 # v4.2.72  requires libEOControl  v4.2.39