Index: openacs-4/packages/acs-templating/tcl/widget-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/widget-procs.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-templating/tcl/widget-procs.tcl 12 Dec 2001 20:54:47 -0000 1.4 +++ openacs-4/packages/acs-templating/tcl/widget-procs.tcl 19 Jan 2002 03:55:16 -0000 1.5 @@ -247,105 +247,6 @@ $element(name) $element(options) $element(values) attributes] } -ad_proc -public template::widget::currency { element_reference tag_attributes } { - - upvar $element_reference element - - if { [info exists element(html)] } { - array set attributes $element(html) - } - - set default { $ 5 . 2 "" } - if { ! [info exists element(format)] } { - set format { {} {} {} {} {} } - } else { - set format [split $element(format) " "] - } - - if { [info exists element(value)] } { - ns_log Notice "element value $element(value)" - ns_log Notice "sep [lindex $format 0][lindex $format 2][lindex $format 4]" - ns_log Notice "checking [string index $element(value) 0] [lindex $format 0]" - if { [string equal [string index $element(value) 0] [lindex $format 0] ] } { - ns_log Notice "in here" - set element(value) [string range $element(value) 1 end] - } - ns_log Notice "new element $element(value)" - set values [split $element(value) "[lindex $format 0][lindex $format 2][lindex $format 4]"] - ns_log Notice "values $values" - } - - set i 0 - foreach format_property $format { - if { $i == 0 || $i == 2 || $i == 4 } { - append output $format_property - } elseif { $i == 1 || $i == 3 } { - set value [lindex $values 0] - set values [lrange $values 1 end] - - if { [string equal $format_property 0] } { - append output $value - } else { - append output "" - } - ns_log Notice "Values $i: [lindex $values $i]" - } - incr i - } - - return $output -} - -ad_proc -public template::data::transform::currency { element_ref } { - - upvar $element_ref element - set element_id $element(id) - - set format [split [ns_queryget "$element_id.format"] ""] - - set have_values 0 - - foreach field { - leading_symbol whole_part seperator fractional_part trailing_symbol - } { - set key "$element_id.$field" - if { [ns_queryexists $key] } { - set value [ns_queryget $key] - - # let's put a leading zero if the whole part is empty - if { [string equal $field whole_part] } { - if { [string equal $value ""] } { - set value 0 - } - } - - # and let's fill in the zeros at the end up to the precision - if { [string equal $field fractional_part] } { - set fractional_part_format [lindex format 3] - for { set i [string length $value] } { $i < $fractional_part_format } { set i [expr $i + 1] } { - append $value 0 - } - } - - # If the value is not null, set it - if { ![string equal $value {}] } { - lappend the_amount $value - set have_values 1 - } - } - } - - lappend the_amount $format - - ns_log Notice "The amount: $the_amount" - - if { $have_values } { - return [list $the_amount] - } else { - return {} - } -} - ad_proc -public template::data::transform::search { element_ref } { upvar $element_ref element