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 } } Index: openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl,v diff -u -r1.38.2.8 -r1.38.2.9 --- openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl 6 Mar 2021 17:00:36 -0000 1.38.2.8 +++ openacs-4/packages/acs-content-repository/tcl/content-item-procs.tcl 9 Apr 2021 07:00:35 -0000 1.38.2.9 @@ -907,7 +907,8 @@ -replace_with "_" $title] set revision_id [cr_import_content \ - -storage_type "file" -title $title \ + -storage_type "file" \ + -title $title \ -package_id $package_id \ $parent_id $tmp_filename $tmp_size $mime_type $filename] Index: openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl,v diff -u -r1.36.2.5 -r1.36.2.6 --- openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl 7 Apr 2021 08:41:33 -0000 1.36.2.5 +++ openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl 9 Apr 2021 07:00:35 -0000 1.36.2.6 @@ -32,45 +32,27 @@ passed in, we determine it from the content item. This is needed to find the attributes for the content type. - @author Dave Bauer (dave@thedesignexperience.org) @creation-date 2004-06-04 @param revision_id - @param item_id - @param content_type - @param title - @param description - @param content - @param mime_type - @param publish_date - @param nls_language - @param creation_date - @param creation_user - @param creation_ip - @param package_id Package_id content belongs to - @param is_live True is revision should be set live - @param tmp_filename file containing content to be added to revision. The caller is responsible for cleaning up the temporary file. - @param package_id - @param is_live - @param attributes A list of lists of pairs of additional attributes and their values to pass to the constructor. Each pair is a list of two elements: key => value such as