Index: openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl	17 May 2003 09:36:29 -0000	1.5
+++ openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl	11 Dec 2003 21:39:45 -0000	1.6
@@ -23,47 +23,10 @@
 
 apm_version_info $version_id
 
-doc_body_append [apm_header [list "version-view?version_id=$version_id" "$pretty_name $version_name"] "Delete"]
+doc_body_append [apm_header "Delete"]
 
-# Unmount all instances of this package with the Tcl API that invokes before-unmount callbacks
-db_foreach all_package_instances {
-    select site_nodes.node_id
-    from apm_packages, site_nodes
-    where apm_packages.package_id = site_nodes.object_id
-    and   apm_packages.package_key = :package_key
-} {
-    set url [site_node::get_url -node_id $node_id]
-    doc_body_append "Unmounting package instance at url $url <br />"
-    site_node::unmount -node_id $node_id
-}
-
-# Delete the package instances with Tcl API that invokes before-uninstantiate callbacks
-db_foreach all_package_instances {
-    select package_id
-    from apm_packages
-    where package_key = :package_key
-} {
-    doc_body_append "Deleting package instance $package_id <br />"
-    apm_package_instance_delete $package_id
-}
-
-# Invoke the before-uninstall Tcl callback before the sql drop scripts
-apm_invoke_callback_proc -version_id $version_id -type before-uninstall
-
-if {![empty_string_p $sql_drop_scripts]} {
-    
-    doc_body_append "Now executing drop scripts.
-<ul>
-"
-    foreach path $sql_drop_scripts {
-	doc_body_append "<li><pre>"
-	db_source_sql_file -callback apm_doc_body_callback "[acs_package_root_dir $package_key]/$path"
-	doc_body_append "</pre>"
-    }
-}
-
 db_transaction {
-    apm_package_delete -remove_files=0 -callback apm_doc_body_callback $package_key
+    apm_package_delete -sql_drop_scripts $sql_drop_scripts -remove_files=0 -callback apm_doc_body_callback $package_key
 } on_error {
     if {[apm_package_registered_p $package_key] } {
 	doc_body_append "The database returned the following error
@@ -74,6 +37,6 @@
 doc_body_append "
 </ul>
 <p>
-Return to the <a href=\"index\">index</a>.
+<p>You should restart the server now to make sure the memory footprint and cache of the package is cleared out. <a href=\"../server-restart\">Click here</a> to restart the server now.</p>
 [ad_footer]
 "