Index: openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl	10 Jul 2006 13:15:13 -0000	1.10
+++ openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl	13 Jul 2006 13:11:43 -0000	1.11
@@ -209,15 +209,15 @@
                 
             }
             {less-than} {
-                set propertyref [$expressionNode selectNodes {*[local-name()='property-ref']}]
-                set propertyvalue0 [imsld::runtime::property::property_value_get -run_id $run_id -user_id $user_id -identifier [$propertyref getAttribute {ref}]]
-                set propertyvalue1 [[$expressionNode selectNodes {*[local-name()='property-value']}] text]
+                set childs [$expressionNode childNodes]
+                set propertyvalue0 [imsld::expression::eval -run_id $run_id -expression [lindex $childs 0]]
+                set propertyvalue1 [imsld::expression::eval -run_id $run_id -expression [lindex $childs 1]]
                 return [expr {$propertyvalue0 < $propertyvalue1}]
             }
             {greater-than} {
-                set propertyref [$expressionNode selectNodes {*[local-name()='property-ref']}]
-                set propertyvalue0 [imsld::runtime::property::property_value_get -run_id $run_id -user_id $user_id -identifier [$propertyref getAttribute {ref}]]
-                set propertyvalue1 [[$expressionNode selectNodes {*[local-name()='property-value']}] text]
+                set childs [$expressionNode childNodes]
+                set propertyvalue0 [imsld::expression::eval -run_id $run_id -expression [lindex $childs 0]]
+                set propertyvalue1 [imsld::expression::eval -run_id $run_id -expression [lindex $childs 1]]
                 return [expr {$propertyvalue0 > $propertyvalue1}]
             }
             {divide} {
@@ -264,15 +264,15 @@
                 return $returnvalue
             }
             {is-not} {
-                set propertyref [$expressionNode selectNodes {*[local-name()='property-ref']}]
-                set propertyvalue0 [imsld::runtime::property::property_value_get -run_id $run_id -user_id $user_id -identifier [$propertyref getAttribute {ref}]]
-                set propertyvalue1 [[$expressionNode selectNodes {*[local-name()='property-value']}] text]
+                set childs [$expressionNode childNodes]
+                set propertyvalue0 [imsld::expression::eval -run_id $run_id -expression [lindex $childs 0]]
+                set propertyvalue1 [imsld::expression::eval -run_id $run_id -expression [lindex $childs 1]]
                 return [expr {$propertyvalue0 != $propertyvalue1}]
             }
             {is} {
-                set propertyref [$expressionNode selectNodes {*[local-name()='property-ref']}]
-                set propertyvalue0 [imsld::runtime::property::property_value_get -run_id $run_id -user_id $user_id -identifier [$propertyref getAttribute {ref}]]
-                set propertyvalue1 [[$expressionNode selectNodes {*[local-name()='property-value']}] text]
+                set childs [$expressionNode childNodes]
+                set propertyvalue0 [imsld::expression::eval -run_id $run_id -expression [lindex $childs 0]]
+                set propertyvalue1 [imsld::expression::eval -run_id $run_id -expression [lindex $childs 1]]
                 return [expr {$propertyvalue0 == $propertyvalue1}]
             }
             {is-member-of-role} {