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 -N -r1.8 -r1.9 --- openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl 6 Jul 2006 10:39:38 -0000 1.8 +++ openacs-4/packages/imsld/tcl/imsld-condition-procs.tcl 6 Jul 2006 11:27:00 -0000 1.9 @@ -207,13 +207,13 @@ {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 [string tolower [$propertyref getAttribute {ref}]]] - set propertyvalue1 [[$expressionNode selectNodes {*[local-name()='property-value']}] nodeValue] + set propertyvalue1 [[$expressionNode selectNodes {*[local-name()='property-value']}] text] 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 [string tolower [$propertyref getAttribute {ref}]]] - set propertyvalue1 [[$expressionNode selectNodes {*[local-name()='property-value']}] nodeValue] + set propertyvalue1 [[$expressionNode selectNodes {*[local-name()='property-value']}] text] return [expr {$propertyvalue0 > $propertyvalue1}] } {divide} { @@ -259,13 +259,13 @@ {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 [string tolower [$propertyref getAttribute {ref}]]] - set propertyvalue1 [[$expressionNode selectNodes {*[local-name()='property-value']}] nodeValue] + set propertyvalue1 [[$expressionNode selectNodes {*[local-name()='property-value']}] text] 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 [string tolower [$propertyref getAttribute {ref}]]] - set propertyvalue1 [[$expressionNode selectNodes {*[local-name()='property-value']}] nodeValue] + set propertyvalue1 [[$expressionNode selectNodes {*[local-name()='property-value']}] text] return [expr {$propertyvalue0 == $propertyvalue1}] } {is-member-of-role} { @@ -288,7 +288,7 @@ } foreach executeNode $statement { - switch -- [$executeNode nodeName] { + switch -- [$executeNode localName] { {show} { foreach refNodes [$executeNode childNodes] { switch -- [$refNodes localName] { @@ -302,7 +302,7 @@ ns_log notice "imsld::statement::execute: class ref is empty" continue } - imsld::runtime::class::show_hide -class $class -run_id $run_id -title $title -with_control $with_control -action "show" + imsld::runtime::class::show_hide -class $class -run_id $run_id -title $title -with_control_p $with_control_p -action "show" } {environment-ref} { # the environments doesn't have any isvisible attribute, @@ -343,7 +343,7 @@ ns_log notice "imsld::statement::execute: class ref is empty" continue } - imsld::runtime::class::show_hide -class $class -run_id $run_id -title $title -with_control $with_control -action "hide" + imsld::runtime::class::show_hide -class $class -run_id $run_id -title $title -with_control_p $with_control_p -action "hide" } {environment-ref} { # the environments doesn't have any isvisible attribute, @@ -373,7 +373,7 @@ } {change-property-value} { set propertyref [$executeNode selectNodes {*[local-name()='property-ref']}] - set propertyvalue [[$executeNode selectNodes {*[local-name()='property-value']}] nodeValue] + set propertyvalue [[$executeNode selectNodes {*[local-name()='property-value']}] text] imsld::runtime::property::property_value_set -run_id $run_id -user_id $user_id -identifier [$propertyref getAttribute {ref}] -value $propertyvalue } {notification} {} Index: openacs-4/packages/imsld/tcl/imsld-runtime-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-runtime-procs.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/imsld/tcl/imsld-runtime-procs.tcl 6 Jul 2006 10:19:27 -0000 1.6 +++ openacs-4/packages/imsld/tcl/imsld-runtime-procs.tcl 6 Jul 2006 11:27:00 -0000 1.7 @@ -242,13 +242,14 @@ or (prop.type = 'globpers' and ins.party_id = :user_id)) and prop.property_id = :property_id } + return $value } ad_proc -public imsld::runtime::class::show_hide { -run_id -class - -title - -with_control + {-title ""} + {-with_control_p ""} -action:required } { mark a class as showh or hidden. NOTE: not recursively @@ -274,7 +275,7 @@ } else { set is_visible_p "f" } - db_dml set_class_shown_hidden { *SQL* } + db_dml set_isvisible_shown_hidden { *SQL* } } ad_proc -public imsld::runtime::environment::show_hide { Index: openacs-4/packages/imsld/tcl/imsld-runtime-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-runtime-procs.xql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/imsld/tcl/imsld-runtime-procs.xql 5 Jul 2006 18:37:17 -0000 1.4 +++ openacs-4/packages/imsld/tcl/imsld-runtime-procs.xql 6 Jul 2006 11:27:00 -0000 1.5 @@ -28,7 +28,7 @@ - + update imsld_attribute_instances set is_visible_p = :is_visible_p, @@ -43,7 +43,7 @@ update imsld_attribute_instances - set is_visible_p = is_visible_p + set is_visible_p = :is_visible_p where run_id = :run_id and identifier = :identifier and type = 'isvisible'