[4suite-checkins] [XPATH_OPTIMIZATIONS-branch] In 4Suite/Ft/Xml/XPath, files BooleanExpressions.py

[Jeremy Kloth]

Branch: XPATH_OPTIMIZATIONS-branch

Modified Files:
    BooleanExpressions.py

Log Message:
Make sure that only XPath data types are used.

ViewCVS diff:
  http://cvs.4suite.org/viewcvs/4Suite/Ft/Xml/XPath/BooleanExpressions.py.diff?r1=1.1.2.1&r2=1.1.2.2
ViewCVS view:
  http://cvs.4suite.org/viewcvs/4Suite/Ft/Xml/XPath/BooleanExpressions.py?rev=1.1.2.2&content-type=text/vnd.viewcvs-markup

Index: BooleanExpressions.py
===================================================================
RCS file: /var/local/cvsroot/4Suite/Ft/Xml/XPath/Attic/BooleanExpressions.py,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -U2 -r1.1.2.1 -r1.1.2.2
--- BooleanExpressions.py	4 Dec 2006 07:56:49 -0000	1.1.2.1
+++ BooleanExpressions.py	6 Dec 2006 19:16:44 -0000	1.1.2.2
@@ -24,8 +24,8 @@
 
     def evaluateAsNumber(self, context):
-        return self.evaluateAsBoolean(context) and 1.0 or 0.0
+        return Number(self.evaluateAsBoolean(context))
 
     def evaluateAsString(self, context):
-        return self.evaluateAsBoolean(context) and u"true" or u"false"
+        return String(self.evaluateAsBoolean(context))