From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Sun, 10 Jun 2007 18:54:52 +0000 (+0000)
Subject: code cleanups
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07020139a0d1d1585c03ac189bdd878a7acb4025;p=sope

code cleanups


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

diff --git a/sope-gdl1/GDLAccess/ChangeLog b/sope-gdl1/GDLAccess/ChangeLog
index 8eee3a43..c4236e36 100644
--- a/sope-gdl1/GDLAccess/ChangeLog
+++ b/sope-gdl1/GDLAccess/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-10  Helge Hess  <helge.hess@opengroupware.org>
+
+	* v4.7.61
+
+	* EOAttribute.m: minor code cleanups
+
+	* EOExpressionArray.m: copy prefix/suffix/infix strings in accessor
+	  methods
+
 2007-06-01  Helge Hess  <helge.hess@opengroupware.org>
 
 	* EOEntity.m, EOAttribute.m: minor improvements/comments on value
diff --git a/sope-gdl1/GDLAccess/EOAttribute.m b/sope-gdl1/GDLAccess/EOAttribute.m
index f5147b6e..1ecc14dd 100644
--- a/sope-gdl1/GDLAccess/EOAttribute.m
+++ b/sope-gdl1/GDLAccess/EOAttribute.m
@@ -108,7 +108,7 @@ static EONull   *null = nil;
 }
 
 - (NSString *)expressionValueForContext:(id<EOExpressionContext>)context {
-  return (context)
+  return (context != nil)
     ? [context expressionValueForAttribute:self]
     : columnName;
 }
diff --git a/sope-gdl1/GDLAccess/EOExpressionArray.m b/sope-gdl1/GDLAccess/EOExpressionArray.m
index c7b5d99e..0b08964c 100644
--- a/sope-gdl1/GDLAccess/EOExpressionArray.m
+++ b/sope-gdl1/GDLAccess/EOExpressionArray.m
@@ -104,13 +104,13 @@
 }
 
 - (void)setPrefix:(NSString *)_prefix {
-    ASSIGN(self->prefix, _prefix);
+    ASSIGNCOPY(self->prefix, _prefix);
 }
 - (void)setInfix:(NSString *)_infix {
-    ASSIGN(self->infix, _infix);
+    ASSIGNCOPY(self->infix, _infix);
 }
 - (void)setSuffix:(NSString *)_suffix {
-    ASSIGN(self->suffix, _suffix);
+    ASSIGNCOPY(self->suffix, _suffix);
 }
 
 - (NSString *)prefix {
@@ -292,7 +292,7 @@
 
 - (NSString *)expressionValueForContext:(id<EOExpressionContext>)ctx {
     if([self respondsToSelector:@selector(stringValue)])
-	return [(id)self stringValue];
+	    return [(id)self stringValue];
 
     return [self description];
 }
diff --git a/sope-gdl1/GDLAccess/Version b/sope-gdl1/GDLAccess/Version
index 7fbe8ee1..9846aa8d 100644
--- a/sope-gdl1/GDLAccess/Version
+++ b/sope-gdl1/GDLAccess/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=60
+SUBMINOR_VERSION:=61