Index: openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl	14 Apr 2003 14:02:07 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl	9 Oct 2003 15:42:35 -0000	1.6
@@ -14,7 +14,15 @@
 }
 
 db_transaction {
-    if { ![catch {set node_id [site_node::get_node_id_from_object_id -object_id $package_id]} errmsg] } {
+    # The catch{} below may be overkill, as it seems
+    # site_node::get_node_id_from_object_id always returns something,
+    # even if it is only an empty string. Not sure what would happen
+    # if we had a db error due to attempting to delete an object instance
+    # twice even though we are in a db_transaction{}, so I opted to keep
+    # the catch{}.
+    # Frank Nikolajsen, 2003-10-09.
+    set return_code [catch {set node_id [site_node::get_node_id_from_object_id -object_id $package_id]} errmsg]
+    if { ![empty_string_p $node_id] && [expr $return_code == 0] } {
         # The package is mounted
         site_node::unmount -node_id $node_id
         site_node::delete -node_id $node_id