Index: openacs-4/packages/acs-tcl/tcl/site-node-apm-integration-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-node-apm-integration-procs.tcl,v diff -u -r1.14.2.1 -r1.14.2.2 --- openacs-4/packages/acs-tcl/tcl/site-node-apm-integration-procs.tcl 21 Jul 2020 14:02:09 -0000 1.14.2.1 +++ openacs-4/packages/acs-tcl/tcl/site-node-apm-integration-procs.tcl 9 Apr 2021 06:59:38 -0000 1.14.2.2 @@ -22,7 +22,7 @@ foreach site_node_info_list [site_node::get_all_from_object_id -object_id $package_id] { ns_log debug "delete_site_nodes_and_package: $site_node_info_list" - + array set site_node $site_node_info_list site_node::unmount -node_id $site_node(node_id) @@ -43,11 +43,11 @@ @return empty string if not found. } { if {$package_id eq ""} { - if {[ns_conn isconnected]} { + if {[ns_conn isconnected]} { set package_id [ad_conn package_id] - } else { + } else { error "Not in a connection and no package_id provided" - } + } } return [db_string select_child_package_id {} -default ""] @@ -57,18 +57,17 @@ {-package_id ""} {-package_key:required} } { - Returns 1 if there exists a child package with the given package_key, + Returns 1 if there exists a child package with the given package_key, or 0 if not. } { set child_package_id [get_child_package_id \ -package_id $package_id \ - -package_key $package_key - ] + -package_key $package_key ] if {$child_package_id eq ""} { return 0 } else { - return 1 + return 1 } }