[gnue] r8635 - trunk/gnue-common/src/datasources

[reinhard]

Author: reinhard
Date: 2006-08-25 06:09:49 -0500 (Fri, 25 Aug 2006)
New Revision: 8635

Modified:
   trunk/gnue-common/src/datasources/GConditions.py
Log:
Further cleanup of valid parent-child pairs for condition trees.


Modified: trunk/gnue-common/src/datasources/GConditions.py
===================================================================
--- trunk/gnue-common/src/datasources/GConditions.py    2006-08-25 10:52:08 UTC 
(rev 8634)
+++ trunk/gnue-common/src/datasources/GConditions.py    2006-08-25 11:09:49 UTC 
(rev 8635)
@@ -1295,21 +1295,17 @@
 
 def getXMLelements (updates = {}):
   xmlElements = {
-      'conditions': {
-         'BaseClass'  : GCondition,
-         'ParentTags' : ('conditions','and','or','not','negate'),
-         'Deprecated' : 'Use the <condition> tag instead.'},
       'condition': {
          'BaseClass'  : GCondition,
-         'ParentTags' : ('conditions','and','or','not','negate')},
+         'ParentTags' : ()},
       'cfield': {
          'BaseClass'  : GCField,
          'Description': 'Defines a database table\'s field in a condition.',
          'Attributes' : {'name': {'Required': True,
                                   'Typecast': GTypecast.name }},
          'ParentTags' : ('eq','ne','lt','le','gt','ge','add','sub','mul',
-                         'div','like','notlike','between','notbetween',
-                         'upper', 'lower', 'null', 'notnull')},
+                         'div','negate','like','notlike','between',
+                         'notbetween','upper','lower','null','notnull')},
       'cconst': {
          'BaseClass'  : GCConst,
          'Description': 'Defines a constant value in a condition.',
@@ -1317,7 +1313,8 @@
                                    'Typecast': GTypecast.text},
                          'type' : {'Typecast': GTypecast.text }},
          'ParentTags' : ('eq','ne','lt','le','gt','ge','add','sub','mul',
-                         'div','like','notlike','between','notbetween')},
+                         'div','negate','like','notlike','between',
+                         'notbetween')},
       'cparam': {
          'BaseClass'  : GCParam,
          'Description': 'Defines a parameter value in a condition.',
@@ -1325,85 +1322,87 @@
                                   'Unique':   True,
                                   'Typecast': GTypecast.name }},
          'ParentTags' : ('eq','ne','lt','le','gt','ge','add','sub','mul',
-                         'div','like','notlike','between','notbetween')},
+                         'div','negate','like','notlike','between',
+                         'notbetween')},
       'and': {
          'BaseClass'  : GCand,
          'Description': 'Implements logical AND relation.',
-         'ParentTags' : ('condition','and','or','not','negate','exist')},
+         'ParentTags' : ('condition','and','or','not','exist')},
       'or': {
          'BaseClass'  : GCor,
          'Description': 'Implements logical OR relation.',
-         'ParentTags' : ('condition','and','or','not','negate','exist')},
+         'ParentTags' : ('condition','and','or','not','exist')},
       'not': {
          'BaseClass'  : GCnot,
          'Description': 'Implements logical NOT relation.',
-         'ParentTags' : ('condition','and','or','not','negate','exist')},
+         'ParentTags' : ('condition','and','or','not','exist')},
       'add': {
          'BaseClass'  : GCadd,
          'Description': 'Implements addition.',
          'ParentTags' : ('eq','ne','lt','le','gt','ge','add','sub','mul',
-                         'div','like','notlike','between','notbetween')},
+                         'div','negate','between','notbetween')},
       'sub': {
          'BaseClass'  : GCsub,
          'Description': 'Implements subtraction.',
          'ParentTags' : ('eq','ne','lt','le','gt','ge','add','sub','mul',
-                         'div','like','notlike','between','notbetween')},
+                         'div','negate','between','notbetween')},
       'mul': {
          'BaseClass'  : GCmul,
          'Description': 'Implements multiplication.',
          'ParentTags' : ('eq','ne','lt','le','gt','ge','add','sub','mul',
-                         'div','like','notlike','between','notbetween')},
+                         'div','negate','between','notbetween')},
       'div': {
          'BaseClass'  : GCdiv,
          'Description': 'Implements division.',
          'ParentTags' : ('eq','ne','lt','le','gt','ge','add','sub','mul',
-                         'div','like','notlike','between','notbetween')},
+                         'div','negate','between','notbetween')},
       'negate': {
          'BaseClass'  : GCnegate,
          'Description': 'Implements numerical negation.',
-         'ParentTags' : ('condition','and','or','not','negate','exist')},
+         'ParentTags' : ('eq','ne','lt','le','gt','ge','add','sub','mul',
+                         'div','between','notbetween')},
       'eq': {
          'BaseClass'  : GCeq,
          'Description': 'Implements a {field} = {value} condition.',
-         'ParentTags' : ('condition','and','or','not','negate','exist')},
+         'ParentTags' : ('condition','and','or','not','exist')},
       'ne': {
          'BaseClass'  : GCne,
          'Description': 'Implements a {field} <> {value} condition.',
-         'ParentTags' : ('condition','and','or','not','negate','exist')},
+         'ParentTags' : ('condition','and','or','not','exist')},
       'gt': {
          'BaseClass'  : GCgt,
          'Description': 'Implements a {field} > {value} condition.',
-         'ParentTags' : ('condition','and','or','not','negate','exist')},
+         'ParentTags' : ('condition','and','or','not','exist')},
       'ge': {
          'BaseClass'  : GCge,
          'Description': 'Implements a {field} >= {value} condition.',
-         'ParentTags' : ('condition','and','or','not','negate','exist')},
+         'ParentTags' : ('condition','and','or','not','exist')},
       'lt': {
          'BaseClass'  : GClt,
          'Description': 'Implements a {field} < {value} condition.',
-         'ParentTags' : ('condition','and','or','not','negate','exist')},
+         'ParentTags' : ('condition','and','or','not','exist')},
       'le': {
          'BaseClass'  : GCle,
          'Description': 'Implements a {field} <= {value} condition.',
-         'ParentTags' :  ('condition','and','or','not','negate','exist')},
+         'ParentTags' :  ('condition','and','or','not','exist')},
       'like': {
          'BaseClass'  : GClike,
          'Description': 'Implements a {field} LIKE {value} condition.',
-         'ParentTags' : ('condition','and','or','not','negate','exist')},
+         'ParentTags' : ('condition','and','or','not','exist')},
       'notlike': {
          'BaseClass'  : GCnotlike,
          'Description': 'Implements a {field} NOT LIKE {value} condition.',
-         'ParentTags' : ('condition','and','or','not','negate','exist')},
+         'ParentTags' : ('condition','and','or','not','exist')},
       'between': {
          'BaseClass'  : GCbetween,
          'Description': 'Implements a {field} BETWEEN {value1} {value2} '
                         'condition.',
-         'ParentTags' : ('condition','and','or','not','negate','exist')},
+         'ParentTags' : ('condition','and','or','not','exist')},
       'notbetween': {
          'BaseClass'  : GCnotbetween,
          'Description': 'Implements a {field} NOT BETWEEN {value1} {value2} '
                         'condition.',
-         'ParentTags' : ('condition','and','or','not','negate','exist')},
+         'ParentTags' : ('condition','and','or','not','exist')},
       'null': {
          'BaseClass'  : GCnull,
          'Description': 'Implements a {field} IS NULL condition.',