Index: openacs-4/contrib/packages/bcms/tcl/bcms-revision-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms/tcl/bcms-revision-procs.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/contrib/packages/bcms/tcl/bcms-revision-procs.tcl 9 Oct 2003 09:57:17 -0000 1.7 +++ openacs-4/contrib/packages/bcms/tcl/bcms-revision-procs.tcl 27 Oct 2003 10:09:10 -0000 1.8 @@ -36,25 +36,19 @@ @param creation_user_id user_id creating this item @param creation_user_ip ip address which this item is created @param additional_properites a list of additional properties / columns to insert format: {property value ... property value} + {property:noquote value} will directly use what is value @returns revision_id of newly created revision } { if {![info exists creation_user_id]} { set creation_user_id [ad_conn user_id] } if {![info exists creation_ip]} { set creation_ip [ad_conn peeraddr] } - # create the additional properties - set addtnl_properties "" - set addtnl_values "" - set addtnl_properties_list {} - set addtnl_values_list {} - if {[exists_and_not_null additional_properties]} { - foreach {property value} $additional_properties { - lappend addtnl_properties_list $property - lappend addtnl_values_list :__$property - set __$property $value - } - set addtnl_properties ",[join $addtnl_properties_list ","]" - set addtnl_values ",[join $addtnl_values_list ","]" + if {[info exists additional_properties]} { + set addtnl_properties ", [bcms::parse_properties -properties $additional_properties -return_format insert_columns]" + set addtnl_values ", [bcms::parse_properties -properties $additional_properties -return_format insert_values]" + } else { + set addtnl_properties "" + set addtnl_values "" } if ![info exists content_type] { @@ -96,7 +90,7 @@ @param creation_user_id user_id creating this item @param creation_user_ip ip address which this item is created @param additional_properites a list of additional properties / columns to insert format: {property value ... property value} - + {property:noquote value} will directly use what is value } { if {![info exists creation_user_id]} { set creation_user_id [ad_conn user_id] } if {![info exists creation_ip]} { set creation_ip [ad_conn peeraddr] } @@ -114,22 +108,16 @@ } # check the mime type if it does not exists insert it if ![db_0or1row check_mime "SQL"] { + set file_extension [string range [file extension $upload_filename] 1 last] db_dml new_mime_type "SQL" } - # create the additional properties - set addtnl_properties "" - set addtnl_values "" - set addtnl_properties_list {} - set addtnl_values_list {} - if {[exists_and_not_null additional_properties]} { - foreach {property value} $additional_properties { - lappend addtnl_properties_list $property - lappend addtnl_values_list :__$property - set __$property $value - } - set addtnl_properties ",[join $addtnl_properties_list ","]" - set addtnl_values ",[join $addtnl_values_list ","]" + if {[info exists additional_properties]} { + set addtnl_properties ", [bcms::parse_properties -properties $additional_properties -return_format insert_columns]" + set addtnl_values ", [bcms::parse_properties -properties $additional_properties -return_format insert_values]" + } else { + set addtnl_properties "" + set addtnl_values "" } db_transaction {