improved query string handling

[sope] / sope-appserver / NGObjWeb / DynamicElements / WOxControlElemBuilder.m

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOxControlElemBuilder.m b/sope-appserver/NGObjWeb/DynamicElements/WOxControlElemBuilder.m
index cbb5de343df77123e1f4b44e600337ede3bd8d8c..4c45607765ddaa13f9c937f185d0f4e61d4bd3bd 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOxControlElemBuilder.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOxControlElemBuilder.m
@@ -1,26 +1,25 @@
 /*
-  Copyright (C) 2000-2004 SKYRIX Software AG
+  Copyright (C) 2000-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOPE.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOPE 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
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOPE is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
   License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
+  License along with SOPE; see the file COPYING.  If not, write to the
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
-#import <NGObjWeb/WOxElemBuilder.h>
+#include <NGObjWeb/WOxElemBuilder.h>
 
 /*
   This builder builds control flow elements, eg conditionals and
@@ -28,6 +27,7 @@
 
   Supported tags:
     <var:if .../>      maps to WOConditional
+    <var:if-not .../>  maps to WOConditional
     <var:foreach .../> maps to WORepetition
     <var:with .../>    maps to WOSetCursor
 */
@@ -39,7 +39,7 @@
 @end
 
 #include <SaxObjC/XMLNamespaces.h>
-#include "common.h"
+#include "decommon.h"
 
 @implementation WOxControlElemBuilder
 
@@ -55,12 +55,14 @@
   
   tag = [_element tagName];
   
-  if ([tag isEqualToString:@"if"]) {
+  if ([tag isEqualToString:@"if"] ||
+      [tag isEqualToString:@"if-not"] || [tag isEqualToString:@"ifnot"]) {
     static Class clazz = Nil;
     if (clazz == Nil)
       clazz = NSClassFromString(@"WOConditional");
     return clazz;
   }
+  
   if ([tag isEqualToString:@"foreach"] || [tag isEqualToString:@"for-each"]) {
     static Class clazz = Nil;
     if (clazz == Nil)