Add libxml2-dev to libsope-xml4.7-dev deps

[sope] / sope-core / NGExtensions / NGRuleEngine.subproj / NGRuleContext.m

diff --git a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleContext.m b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleContext.m
index 9d39fffba7280c37960c8335b1397783090923cc..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.
 
@@ -24,7 +25,7 @@
 #include "NGRuleModel.h"
 #include "NSObject+Logs.h"
 #include "common.h"
-#include <EOControl/EOQualifier.h>
+#import <EOControl/EOQualifier.h>
 
 @implementation NGRuleContext
 
@@ -146,7 +147,7 @@
         [self debugWithFormat:@"  rule %i matches: %@", i, rule];
       
       v = [[rule action] fireInContext:self];
-      [values addObject:(v ? v : [NSNull null])];
+      [values addObject:(v != nil ? v : (id)[NSNull null])];
     }
   }
   if (self->debugOn)
@@ -187,8 +188,8 @@
     [self takeValue:[_values objectAtIndex:i] forKeyPath:_valkp];
 
     /* calculate the rule value */
-    ruleValue = [self valueForKey:_kp];
-    [results addObject:ruleValue ? ruleValue : [NSNull null]];
+    ruleValue = [self valueForKeyPath:_kp];
+    [results addObject:(ruleValue != nil ? ruleValue : (id)[NSNull null])];
   }
   return results;
 }