Added delete protocol.

lib/python/OFS/CopySupport.py

@@ -83,7 +83,7 @@
 # 
 ##############################################################################
 __doc__="""Copy interface"""
-__version__='$Revision: 1.33 $'[11:-2]
+__version__='$Revision: 1.34 $'[11:-2]
 
 import sys, string, Globals, Moniker, tempfile, ExtensionClass
 from marshal import loads, dumps
@@ -212,7 +212,7 @@ class CopyContainer(ExtensionClass.Base):
                 id=absattr(ob.id)
                 if not ob.cb_isMoveable():
                     raise CopyError, eNotSupported % id
-                ob.aq_parent._delObject(id)
+                ob.aq_parent._delObject(id, dp=0)
                 if hasattr(ob, 'aq_base'):
                     ob=ob.aq_base
                 id=_get_id(self, id)
@@ -248,7 +248,7 @@ class CopyContainer(ExtensionClass.Base):
                       title='Rename Error',
                       message=sys.exc_value,
                       action ='manage_main')
-        self._delObject(id)
+        self._delObject(id, dp=0)
         if hasattr(ob, 'aq_base'):
             ob=ob.aq_base
         self._setObject(new_id, ob)

lib/python/OFS/ObjectManager.py

@@ -84,9 +84,9 @@
 ##############################################################################
 __doc__="""Object Manager
 
-$Id: ObjectManager.py,v 1.70 1999/04/30 14:12:56 brian Exp $"""
+$Id: ObjectManager.py,v 1.71 1999/05/05 14:58:34 brian Exp $"""
 
-__version__='$Revision: 1.70 $'[11:-2]
+__version__='$Revision: 1.71 $'[11:-2]
 
 import App.Management, Acquisition, App.Undo, Globals, CopySupport
 import os, App.FactoryDispatcher, ts_regex, Products
@@ -213,7 +213,7 @@ class ObjectManager(
                 object.manage_setLocalRoles(name, ['Owner'])
         return id
 
-    def _delObject(self,id):
+    def _delObject(self, id, dp=1):
         if id=='acl_users':
             # Yikes - acl_users is referred to by two names and
             # must be treated as a special case! Only get rid of
@@ -224,7 +224,17 @@ class ObjectManager(
             if hasattr(self, '__allow_groups__') and \
                self.__dict__.has_key('__allow_groups__'):
                 delattr(self, '__allow_groups__')
-
+        # Deletion protocol - when an object is being deleted,
+        # attempt to call it's _on_delete_object method if
+        # if has one. The dp flag allows allows callers to
+        # avoid having the delete protocol triggered (for
+        # instance when an object is cut and pasted).
+        if dp:
+            ob=self._getOb(id)
+            if hasattr(ob, '_on_delete_object') and \
+               callable(ob._on_delete_object):
+                ob._on_delete_object()
+            del ob
         self._objects=tuple(filter(lambda i,n=id: i['id']!=n, self._objects))
         self._delOb(id)
 

lib/python/OFS/SimpleItem.py

@@ -89,8 +89,8 @@ Aqueduct database adapters, etc.
 This module can also be used as a simple template for implementing new
 item types. 
 
-$Id: SimpleItem.py,v 1.47 1999/04/28 16:25:45 brian Exp $'''
-__version__='$Revision: 1.47 $'[11:-2]
+$Id: SimpleItem.py,v 1.48 1999/05/05 14:58:34 brian Exp $'''
+__version__='$Revision: 1.48 $'[11:-2]
 
 import regex, sys, Globals, App.Management, Acquisition
 from webdav.Resource import Resource
@@ -110,6 +110,14 @@ class Item(Base, Resource, CopySource, App.Management.Tabs):
     isPrincipiaFolderish=0
     isTopLevelPrincipiaApplicationObject=0
 
+
+
+    # HACK HACK HACK -- TAKE THIS OUT LATER!!!!
+    def _on_delete_object(self):
+        if hasattr(self, 'onDeleteObject') and \
+           callable(self.onDeleteObject):
+            self.onDeleteObject()
+
     # The name of this object and the name used to traverse to thie
     # object in a URL:
     id=''