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

Author: reinhard
Date: 2008-12-01 10:22:35 -0600 (Mon, 01 Dec 2008)
New Revision: 9901

Modified:
   trunk/gnue-common/src/datasources/GConditions.py
Log:
Fixed endless recursion.


Modified: trunk/gnue-common/src/datasources/GConditions.py
===================================================================
--- trunk/gnue-common/src/datasources/GConditions.py	2008-11-27 14:30:13 UTC (rev 9900)
+++ trunk/gnue-common/src/datasources/GConditions.py	2008-12-01 16:22:35 UTC (rev 9901)
@@ -1630,9 +1630,11 @@
     # String-Conversions
     if isinstance (v1, unicode) or isinstance (v2, unicode):
       if isinstance (v1, unicode):
+        changev2 = False
         oldValue = v1
         chkValue = v2
       else:
+        changev2 = True
         oldValue = v2
         chkValue = v1
 
@@ -1698,9 +1700,11 @@
     # Boolean conversions
     elif isinstance (v1, bool) or isinstance (v2, bool):
       if isinstance (v1, bool):
+        changev2 = False
         oldValue = v1
         chkValue = v2
       else:
+        changev2 = True
         oldValue = v2
         chkValue = v1
 
@@ -1732,9 +1736,11 @@
     # Integer conversions
     elif isinstance (v1, int) or isinstance (v2, int):
       if isinstance (v1, int):
+        changev2 = False
         oldValue = v1
         chkValue = v2
       else:
+        changev2 = True
         oldValue = v2
         chkValue = v1
   
@@ -1756,9 +1762,11 @@
     # Long conversions
     elif isinstance (v1, long) or isinstance (v2, long):
       if isinstance (v1, long):
+        changev2 = False
         oldValue = v1
         chkValue = v2
       else:
+        changev2 = True
         oldValue = v2
         chkValue = v1
   
@@ -1779,9 +1787,11 @@
                 or isinstance (v2, decimal.Decimal)):
 
       if isinstance (v1, decimal.Decimal):
+        changev2 = False
         oldValue = v1
         chkValue = v2
       else:
+        changev2 = True
         oldValue = v2
         chkValue = v1
 
@@ -1795,9 +1805,11 @@
          isinstance (v2, datetime.datetime):
 
       if isinstance (v1, datetime.datetime):
+        changev2 = False
         oldValue = v1
         chkValue = v2
       else:
+        changev2 = True
         oldValue = v2
         chkValue = v1
 
@@ -1812,9 +1824,11 @@
     elif isinstance (v1, mx_DateTimeType) or \
          isinstance (v2, mx_DateTimeType):
       if isinstance (v1, mx_DateTimeType):
+        changev2 = False
         oldValue = v1
         chkValue = v2
       else:
+        changev2 = True
         oldValue = v2
         chkValue = v1
 
@@ -1832,9 +1846,11 @@
     elif isinstance (v1, mx_DateTimeDeltaType) or \
          isinstance (v2, mx_DateTimeDeltaType):
       if isinstance (v1, mx_DateTimeDeltaType):
+        changev2 = False
         oldValue = v1
         chkValue = v2
       else:
+        changev2 = True
         oldValue = v2
         chkValue = v1
 
@@ -1848,9 +1864,11 @@
     elif isinstance (v1, datetime.timedelta) or \
          isinstance (v2, datetime.timedelta):
       if isinstance (v1, datetime.timedelta):
+        changev2 = False
         oldValue = v1
         chkValue = v2
       else:
+        changev2 = True
         oldValue = v2
         chkValue = v1
 
@@ -1863,5 +1881,5 @@
     else:
       raise ConversionRuleError, (v1, v2)
   
-    values [oldValue == v2] = newValue
+    values [changev2] = newValue
     __unify (values, result)