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 -N -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/acs-tcl/tcl/site-node-apm-integration-procs.tcl 5 Mar 2003 14:40:42 -0000 1.4.2.1 +++ openacs-4/packages/acs-tcl/tcl/site-node-apm-integration-procs.tcl 20 Mar 2003 12:48:11 -0000 1.4.2.2 @@ -49,7 +49,7 @@ site_node::update_cache -node_id $site_node(node_id) } - apm_package_delete_instance $package_id + apm_package_instance_delete $package_id } } Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql,v diff -u -N -r1.11.2.1 -r1.11.2.2 --- openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql 2 Feb 2003 21:19:26 -0000 1.11.2.1 +++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs-oracle.xql 20 Mar 2003 12:48:11 -0000 1.11.2.2 @@ -57,6 +57,7 @@ select site_node.url(node_id) from site_nodes where object_id = :object_id + order by site_node__url(node_id) desc Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql,v diff -u -N -r1.15.2.1 -r1.15.2.2 --- openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql 2 Feb 2003 21:19:26 -0000 1.15.2.1 +++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs-postgresql.xql 20 Mar 2003 12:48:11 -0000 1.15.2.2 @@ -53,6 +53,7 @@ select site_node__url(node_id) from site_nodes where object_id = :object_id + order by site_node__url(node_id) desc Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v diff -u -N -r1.17.2.6 -r1.17.2.7 --- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl 18 Mar 2003 16:02:02 -0000 1.17.2.6 +++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl 20 Mar 2003 12:48:11 -0000 1.17.2.7 @@ -267,10 +267,12 @@ ad_proc -public get_all_from_object_id { {-object_id:required} } { - return a list of site nodes associated with the given object_id + Return a list of site node info associated with the given object_id. + The nodes will be ordered descendingly by url (children before their parents). } { set node_id_list [list] + set url_list [list] foreach url [get_url_from_object_id -object_id $object_id] { lappend node_id_list [get -url $url] } @@ -295,7 +297,10 @@ {-object_id:required} } { returns a list of urls for site_nodes that have the given object - mounted or the empty list if there are none + mounted or the empty list if there are none. The + url:s will be returned in descending order meaning any children will + come before their parents. This ordering is useful when deleting site nodes + as we must delete child site nodes before their parents. } { return [db_list select_url_from_object_id {}] }