[Zapp-cvs-commit] ZApp ZApp_CMFBase.py,1.45,1.46

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

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

Modified Files:
	ZApp_CMFBase.py 
Log Message:
more DAV work with images.. 

Index: ZApp_CMFBase.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_CMFBase.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** ZApp_CMFBase.py	30 Mar 2004 17:23:03 -0000	1.45
--- ZApp_CMFBase.py	31 Mar 2004 13:31:09 -0000	1.46
***************
*** 17,23 ****
  from ZApp_LOG import ZApp_LOG
  
  
  missing = []
! dbug_level = 0 # make 100 to blather about various CMF related events.. 
  
  lpcol = LeverPropertyCollection
--- 17,25 ----
  from ZApp_LOG import ZApp_LOG
  
+ from Globals import InitializeClass
+ 
  
  missing = []
! dbug_level = 100 # 100 # make 100 to blather about various CMF related events.. 
  
  lpcol = LeverPropertyCollection
***************
*** 187,191 ****
              self.change(safeStorageID = safeStorageID, cmf_portal_type=self.portal_type )
  
-             ZApp_LOG("commit sub-transaction...")
              get_transaction().commit(1)
          
--- 189,192 ----
***************
*** 303,307 ****
          checkRecursion = self.ZAppRecusionLock_checkSet()
          
!         ZApp_LOG("_manage_afterAdd: " + self.getId() + ":" + safeStorageID + ":_v_in_manage_afterAdd:" + `checkRecursion`, dbug_level)
  
          if not checkRecursion:
--- 304,308 ----
          checkRecursion = self.ZAppRecusionLock_checkSet()
          
!         ZApp_LOG("ZAppBase_manage_afterAdd: " + self.getId() + ":" + safeStorageID + ":_v_in_manage_afterAdd:" + `checkRecursion`, dbug_level)
  
          if not checkRecursion:
***************
*** 334,337 ****
--- 335,355 ----
              self.ZAppRecursionLock_clear()
  
+     def manage_callPUTFilter(self):
+         """
+         Check for data.. and call PUT filter hook if found.. should only be used for
+         types with .data (e.g., Image, File etc.. )
+         """
+         objID = self.getId()
+         if objID and objID[0] != '.':
+             if hasattr(self, 'getData') and self.getData():
+                 hook_method = getattr(self, 'ZApp_PUT_filter', None)
+                 if hook_method:
+                     ZApp_LOG("manage_callPUTFilter filter hook...", dbug_level)
+                     hook_method( self )
+                 else:
+                     ZApp_LOG("manage_callPUTFilter no filter hook...", dbug_level)
+             else:
+                 ZApp_LOG("manage_callPUTFIlter no data (yet?) ...", dbug_level)
+ 
      def copyObjectRelations(self, theObjectRelations):
          """
***************
*** 369,372 ****
--- 387,392 ----
          """
  
+         ZApp_LOG("in.. FSFolder PUT Factory... ", dbug_level)
+ 
          pf = getattr(self, 'ZApp_putFactory', None)
          if not pf:
***************
*** 374,378 ****
                  self.invokeFactory( self.preferredMediaType, name )
                  obj = aq_base( self._getOb( name ) )
!                 #self._delObject( name )
                  return obj
          else:
--- 394,398 ----
                  self.invokeFactory( self.preferredMediaType, name )
                  obj = aq_base( self._getOb( name ) )
!                 self._delObject( name )
                  return obj
          else:
***************
*** 410,413 ****
--- 430,441 ----
  
  
+     def manage_afterAdd(self, item, container):
+         """
+         Do manage_afterAdd
+         """
+         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):
          """
***************
*** 498,504 ****
--- 526,552 ----
          return fsObj and fsObj.index_html(REQUEST, RESPONSE)
  
+     def getData(self):
+         """
+         get file data.
+         """
+         fsObj = self.fs_object
+         size = self.fs_object.get_size()
+         ZApp_LOG(("in ZApp_FSObject: found size = %i" % size), dbug_level)
+         if fsObj:
+             fsObj = fsObj.data
+             if fsObj:
+                 ZApp_LOG("in ZApp_FSObject: found fsObj and data", dbug_level)
+             else:
+                 ZApp_LOG("in ZApp_FSObject: found fsObj but no data", dbug_level)
+         else:
+             ZApp_LOG("in ZApp_FSObject: no fsObj", dbug_level)
+             
+         return fsObj
+     
      def PUT(self, REQUEST, RESPONSE):
          """Handle HTTP PUT requests"""
  
+         ZApp_LOG("In FS File PUT", dbug_level)
+ 
          newID = self.getId()
          if self.fs_object is None:
***************
*** 511,523 ****
              fileObj = self.fs_object
  
          if fileObj:
!             hook_method = getattr(self, 'ZApp_PUT_Filter', None)
!             if hook_method:
!                 hook_method(REQUEST, RESPONSE)
! 
!             fileObj.PUT( REQUEST, RESPONSE)
              self.content_type = fileObj.content_type
              self.setFormat(self.content_type)
              self.size = fileObj.get_size()
  
      manage_FTPget = index_html
--- 559,572 ----
              fileObj = self.fs_object
  
+         result = None
          if fileObj:
!             result = fileObj.PUT( REQUEST, RESPONSE)
              self.content_type = fileObj.content_type
              self.setFormat(self.content_type)
              self.size = fileObj.get_size()
+             ZApp_LOG(("PUT real file In FS File PUT:%i bytes" % self.size), dbug_level)
+             self.manage_callPUTFilter()
+ 
+         return result
  
      manage_FTPget = index_html
***************
*** 613,616 ****
--- 662,666 ----
          """
  
+         ZApp_LOG("In edit fs object... ", dbug_level)
          if not file:
              file = REQUEST and REQUEST.form.get('file',None)
***************
*** 638,641 ****
--- 688,692 ----
              self.size = fileObj.get_size()
              self.setFormat(self.content_type)
+             self.manage_callPUTFilter()
  
          return oldID, newID, newTitle
***************
*** 644,647 ****
--- 695,700 ----
          """Handle HTTP PUT requests"""
  
+         ZApp_LOG("In FS Image PUT", dbug_level)
+ 
          newID = self.getId()
          if self.fs_object is None:
***************
*** 654,663 ****
              fileObj = self.fs_object
  
          if fileObj:
!             hook_method = getattr(self, 'ZApp_PUT_Filter', None)
!             if hook_method:
!                 hook_method(REQUEST, RESPONSE)
! 
!             fileObj.PUT( REQUEST, RESPONSE)
              self.content_type = fileObj.content_type
              self.width = fileObj.width
--- 707,713 ----
              fileObj = self.fs_object
  
+         result = None
          if fileObj:
!             result = fileObj.PUT( REQUEST, RESPONSE)
              self.content_type = fileObj.content_type
              self.width = fileObj.width
***************
*** 665,669 ****
--- 715,722 ----
              self.size = fileObj.get_size()
              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
  
  extendProperties(ZApp_CMF_FSImage, [])
***************
*** 694,697 ****
--- 747,751 ----
          Do manage_afterAdd
          """
+         ZApp_LOG("In ZODB Image manage_afterAdd... ", dbug_level)
          checkRecursion = self.ZAppBase_manage_afterAdd(item, container)
  
***************
*** 699,727 ****
              Image.manage_afterAdd(self, item, container)
              ZApp_Base.manage_afterAdd(self, item, container)
! 
              self.ZAppRecursionLock_clear()
  
!     def edit(self, precondition='', file=''):
!         """ Update and reindex. """
!         return Image.edit(self, precondition=precondition, file=file)
! 
!     def index_html(self, REQUEST=None, RESPONSE=None):
          """
!         use Image version...
          """
!         return Image.index_html(self, REQUEST, RESPONSE)
  
      def PUT(self, REQUEST, RESPONSE):
!         """Handle HTTP PUT requests"""
! 
!         import pdb
!         pdb.set_trace()
!         
!         hook_method = getattr(self, 'ZApp_PUT_Filter', None)
!         if hook_method:
!             hook_method(REQUEST, RESPONSE)
  
!         return Image.PUT(self, REQUEST, RESPONSE)
  
      __str__ = Image.__str__
      __len__ = Image.__len__
--- 753,780 ----
              Image.manage_afterAdd(self, item, container)
              ZApp_Base.manage_afterAdd(self, item, container)
!             self.manage_callPUTFilter()
              self.ZAppRecursionLock_clear()
  
!     def getData(self):
          """
!         return data object.
          """
!         return self.data
  
      def PUT(self, REQUEST, RESPONSE):
!         """
!         Handle a webdave PUT...
!         """
!         ZApp_LOG("In ZODB PUT", dbug_level)
!         Image.PUT(self, REQUEST, RESPONSE)
!         self.manage_callPUTFilter()
  
!     def edit(self, precondition='', file=''):
!         """
!         delegate to Image class.. but add hook...
!         """
!         Image.edit(self, precondition, file)
  
+     index_html = Image.index_html
      __str__ = Image.__str__
      __len__ = Image.__len__