[Zapp-cvs-commit] ZApp ZApp_CMFBase.py,1.47,1.48

[Steve S. <ssp...@us...>]

Update of /cvsroot/zapp/ZApp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24765

Modified Files:
	ZApp_CMFBase.py 
Log Message:
don't need custom hook in manage_afterAdd any more.. 

Index: ZApp_CMFBase.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_CMFBase.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** ZApp_CMFBase.py	31 Mar 2004 13:36:23 -0000	1.47
--- ZApp_CMFBase.py	31 Mar 2004 17:33:26 -0000	1.48
***************
*** 21,25 ****
  
  missing = []
! dbug_level = 0 # 100 # make 100 to blather about various CMF related events.. 
  
  lpcol = LeverPropertyCollection
--- 21,25 ----
  
  missing = []
! dbug_level = 100 # 100 # make 100 to blather about various CMF related events.. 
  
  lpcol = LeverPropertyCollection
***************
*** 422,425 ****
--- 422,426 ----
                              "WITH SELF COMPUTE fs_container=self.getCurrFolder()",
                              "WITH SELF COMPUTE fs_object=self.getFSObject()",
+                             "WHEN OBJECT DELETED CALL self.removeFSObject()",
                              )
  
***************
*** 436,440 ****
          ZApp_LOG("ZApp FS Object Manage after add", dbug_level)
          ZApp_CMFBase.manage_afterAdd(self, item, container)
!         self.manage_callPUTFilter()
  
      def objectValues(self, spec=None):
--- 437,441 ----
          ZApp_LOG("ZApp FS Object Manage after add", dbug_level)
          ZApp_CMFBase.manage_afterAdd(self, item, container)
!         #self.manage_callPUTFilter()
  
      def objectValues(self, spec=None):
***************
*** 488,491 ****
--- 489,499 ----
          return theFSObject
  
+     def removeFSObject(self):
+         """
+         Remove my FS object... 
+         """
+         if self.getId() in self.fs_container.objectIds():
+             self.fs_container.manage_delObjects(self.getId())
+ 
      def edit_fs_object(self, id='', title='', file=None, REQUEST=None):
          """
***************
*** 549,552 ****
--- 557,563 ----
          ZApp_LOG("In FS File PUT", dbug_level)
  
+         import pdb
+         pdb.set_trace()
+ 
          newID = self.getId()
          if self.fs_object is None:
***************
*** 688,692 ****
              self.size = fileObj.get_size()
              self.setFormat(self.content_type)
-             self.manage_callPUTFilter()
  
          return oldID, newID, newTitle
--- 699,702 ----
***************
*** 716,720 ****
              self.setFormat(self.content_type)
              ZApp_LOG(("PUT real file In FS Image PUT:%i bytes" % self.size), dbug_level)
!             self.manage_callPUTFilter()
  
          return result
--- 726,731 ----
              self.setFormat(self.content_type)
              ZApp_LOG(("PUT real file In FS Image PUT:%i bytes" % self.size), dbug_level)
!             if self.size:
!                 self.manage_callPUTFilter()
  
          return result
***************
*** 753,757 ****
              Image.manage_afterAdd(self, item, container)
              ZApp_Base.manage_afterAdd(self, item, container)
-             self.manage_callPUTFilter()
              self.ZAppRecursionLock_clear()
  
--- 764,767 ----