From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Mon, 11 Oct 2004 20:33:14 +0000 (+0000)
Subject: fixed a bug in selector processing
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b1424b2e3d638ecb293799b7534964fdbd75060;p=sope

fixed a bug in selector processing


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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index edce86be..9b96516f 100644
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-11  Helge Hess  <helge.hess@opengroupware.org>
 
+	* SoObjects/SoObjCClass.m: fixed a bug in "Action" selector processing
+	  (v4.3.62)
+
 	* v4.3.61
 
 	* SoObjects/product.plist: properly export SoActionInvocation
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m b/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m
index 4352811b..5db7e94c 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "WOHTMLDynamicElement.h"
 
@@ -123,7 +122,7 @@
   
   sComponent = [_ctx component];
   hide = [self->hideInComment boolValueInComponent:sComponent];
-    
+  
   WOResponse_AddCString(_response, "<script language=\"JavaScript\" ");
 
   /* add URL to script */
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m b/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
index 39d3c5da..237dc6cd 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include <NGObjWeb/WODynamicElement.h>
 #include "WOElement+private.h"
@@ -854,7 +853,9 @@ _sapplyIndex(_WOSimpleRepetition *self, WOComponent *sComponent, NSArray *array,
 /* description */
 
 - (NSString *)associationDescription {
-  NSMutableString *str = [NSMutableString stringWithCapacity:24];
+  NSMutableString *str;
+  
+  str = [NSMutableString stringWithCapacity:24];
   if (self->list)     [str appendFormat:@" list=%@",     self->list];
   if (self->item)     [str appendFormat:@" item=%@",     self->item];
   if (self->template) [str appendFormat:@" template=%@", self->template];
diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjCClass.m b/sope-appserver/NGObjWeb/SoObjects/SoObjCClass.m
index 0d045f4a..d0435d02 100644
--- a/sope-appserver/NGObjWeb/SoObjects/SoObjCClass.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoObjCClass.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: SoObjCClass.m 1 2004-08-20 10:08:27Z znek $
 
 #include "SoObjCClass.h"
 #include "SoSelectorInvocation.h"
@@ -61,9 +61,10 @@
     r = [methodName rangeOfString:@"Action"];
     if (r.length == 0) continue;
     
+    /* eg: doItAction:abc: => doItAction */
     methodPrefix = [methodName substringToIndex:(r.location + r.length)];
     
-    if ((r.location + r.length) > len) {
+    if (len > (r.location + r.length)) {
       /* something is beyond the xxxAction, *must* be followed by a colon */
       if ([methodName characterAtIndex:(r.location + r.length)] != ':')
 	continue;
diff --git a/sope-appserver/NGObjWeb/SoObjects/WODirectAction+SoObjects.m b/sope-appserver/NGObjWeb/SoObjects/WODirectAction+SoObjects.m
index 01d2ed12..9c89a88f 100644
--- a/sope-appserver/NGObjWeb/SoObjects/WODirectAction+SoObjects.m
+++ b/sope-appserver/NGObjWeb/SoObjects/WODirectAction+SoObjects.m
@@ -52,7 +52,7 @@
   SEL sel;
   
   daName = [_name stringByAppendingString:@"Action"];
-  sel    = NSSelectorFromString(daName);
+  sel    = daName ? NSSelectorFromString(daName) : NULL;
   
   if (![self respondsToSelector:sel])
     return [super lookupName:_name inContext:_ctx acquire:_flag];
diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index ca7d1576..5bc45e6d 100644
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=61
+SUBMINOR_VERSION:=62
 
 # v4.3.42  requires libNGExtensions v4.3.116
 # v4.3.40  requires libNGExtensions v4.3.115