Index: openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl,v diff -u -r1.17 -r1.18 --- openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl 19 Jan 2018 13:40:40 -0000 1.17 +++ openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl 8 May 2018 22:37:18 -0000 1.18 @@ -1,5 +1,5 @@ ad_page_contract { - Adds a dependency to a version of a package. + Adds a dependency to a version of a package. @author Bryan Quinn @creation-date 17 April 2000 @cvs-id $Id$ @@ -12,41 +12,40 @@ } set service [split $service ";"] -set package_key [lindex $service 0] -set version_name [lindex $service 1] +lassign $service package_key version_name apm_package_install_spec $version_id db_transaction { switch -- $dependency_type { - require { - apm_dependency_add -dependency_id $dependency_id ${dependency_type}s $version_id $package_key $version_name + require { + apm_dependency_add -dependency_id $dependency_id ${dependency_type}s $version_id $package_key $version_name apm_build_one_package_relationships $our_package_key - } + } extend { - apm_dependency_add -dependency_id $dependency_id ${dependency_type}s $version_id $package_key $version_name + apm_dependency_add -dependency_id $dependency_id ${dependency_type}s $version_id $package_key $version_name apm_build_one_package_relationships $our_package_key apm_copy_inherited_params $our_package_key [list $package_key $version_name] - } + } embed { - apm_dependency_add -dependency_id $dependency_id ${dependency_type}s $version_id $package_key $version_name + apm_dependency_add -dependency_id $dependency_id ${dependency_type}s $version_id $package_key $version_name apm_build_one_package_relationships $our_package_key apm_copy_inherited_params $our_package_key [list $package_key $version_name] - } + } - default { - ad_return_complaint 1 "Entry error: Allowable dependencies are required, extends and embeds." - } + default { + ad_return_complaint 1 "Entry error: Allowable dependencies are required, extends and embeds." + } } } on_error { if { ![db_string apm_dependency_doubleclick_check { - select count(*) from apm_package_dependencies - where dependency_id = :dependency_id + select count(*) from apm_package_dependencies + where dependency_id = :dependency_id } -default 0] } { - ad_return_complaint 1 "The database returned the following error: -
[ns_quotehtml $errmsg]
" + ad_return_complaint 1 "The database returned the following error: +
[ns_quotehtml $errmsg]
" } }