Index: openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl 22 Apr 2001 16:13:15 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl 21 Jun 2002 19:08:33 -0000 1.3 @@ -2,30 +2,20 @@ ad_page_contract { - @author rhs@mit.edu - @creation-date 2000-09-09 - @cvs-id $Id$ + @author rhs@mit.edu + @creation-date 2000-09-09 + @version $Id$ + } { - expand:integer,multiple - node_id:integer,notnull - {root_id:integer {}} + expand:integer,multiple + node_id:integer,notnull + {root_id:integer ""} } -db_transaction { - - if {$root_id == $node_id} { - set root_id [db_string parent_select { - select parent_id - from site_nodes - where node_id = :node_id - }] - } - - db_exec_plsql node_delete { - begin - site_node.delete(:node_id); - end; - } +if {$root_id == $node_id} { + set root_id [site_node::get_parent_id -node_id $node_id] } -ad_returnredirect .?[export_url_vars expand:multiple root_id] +site_node::delete -node_id $node_id + +ad_returnredirect ".?[export_url_vars expand:multiple root_id]"