[Zapp-cvs-commit] ZApp ZApp_CMFBase.py,1.35,1.36

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

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

Modified Files:
	ZApp_CMFBase.py 
Log Message:
fixed fSystem based image/files copy/paste

Index: ZApp_CMFBase.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_CMFBase.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** ZApp_CMFBase.py	19 Mar 2004 15:53:30 -0000	1.35
--- ZApp_CMFBase.py	21 Mar 2004 12:26:09 -0000	1.36
***************
*** 7,10 ****
--- 7,11 ----
  import string
  import traceback
+ import os
  
  from Products.PageTemplates.PageTemplateFile import PageTemplateFile
***************
*** 225,233 ****
          operation.
          """
- 
          get = safeStorage.getXMLAttr
          op = get('operationType','')
          oldID = get('oldID','')
          mySpec = self.getMySpecialist()
          newRelID = self.calcPathID().split(newID)[1]
          oldItemID = oldID + newRelID
--- 226,234 ----
          operation.
          """
          get = safeStorage.getXMLAttr
          op = get('operationType','')
          oldID = get('oldID','')
          mySpec = self.getMySpecialist()
+         myDM = self.getDataManagerFor(self, None)
          newRelID = self.calcPathID().split(newID)[1]
          oldItemID = oldID + newRelID
***************
*** 235,240 ****
          ZApp_LOG("ZAppCMF_afterAdd: " + newRelID + ":" + oldItemID + ":" + mySpec.getId() + ":", dbug_level)
  
!         if mySpec and oldItemID:
!             oldSelf = mySpec.getItem( oldItemID )
              if oldSelf:
                  newSelf = mySpec.ZApp_createNewItem(id=self.calcPathID())
--- 236,241 ----
          ZApp_LOG("ZAppCMF_afterAdd: " + newRelID + ":" + oldItemID + ":" + mySpec.getId() + ":", dbug_level)
  
!         if mySpec and myDM and oldItemID:
!             oldSelf = myDM.getItem( oldItemID )
              if oldSelf:
                  newSelf = mySpec.ZApp_createNewItem(id=self.calcPathID())
***************
*** 252,257 ****
--- 253,262 ----
                      #
                      oldSelf.manage_delete()
+                     if hasattr(self, 'zcmf_moveToCurrPath'):
+                         self.zcmf_moveToCurrPath( oldSelf )
                  else:
                      oldSelf.change(safeStorageID = '')
+                     if hasattr(self, 'zcmf_copyToCurrPath'):
+                         self.zcmf_copyToCurrPath( oldSelf )
  
                  for item in self.objectValues():
***************
*** 315,320 ****
      _custom_skin_scripts = ("WITH SELF COMPUTE portal_object_id=_.getattr(self, 'zapp_portal_id')",
                              "WITH SELF COMPUTE portal_object=_.getattr(self.findApplication(), self.portal_object_id)"
!                             "WITH SELF COMPUTE fs_object_url=self.findApplication().absolute_url() + ( '/fSystem/%s/%s/%s' % (self.getPhysicalPath()[1], self.portal_object_id, self.cmfdataid[1:].replace(',','/')))",
                              )
  
  class ZApp_CMF_FSImage( ZApp_CMF_FSObject):
--- 320,350 ----
      _custom_skin_scripts = ("WITH SELF COMPUTE portal_object_id=_.getattr(self, 'zapp_portal_id')",
                              "WITH SELF COMPUTE portal_object=_.getattr(self.findApplication(), self.portal_object_id)"
!                             "WITH SELF COMPUTE fs_object_relpath='%s/%s/%s' % (self.getPhysicalPath()[1], self.portal_object_id, self.cmfdataid[1:].replace(',','/'))",
!                             "WITH SELF COMPUTE fs_object_url=self.findApplication().absolute_url() + '/fSystem/' + self.fs_object_relpath",
!                             "WITH SELF COMPUTE fs_root_object=self.findApplication().fSystem",
!                             "WITH SELF COMPUTE fs_object_path='%s/%s' % (self.fs_root_object.basepath, self.fs_object_relpath)",
                              )
+                             
+     def zcmf_copyToCurrPath( self, oldSelf ):
+         """
+         for copy operation....  copy old fs object to new location.
+         """
+         oldPath = oldSelf.fs_object_path
+         newPath = self.fs_object_path
+         os.system("cp %s %s" % (oldPath, newPath))
+ 
+     def zcmf_moveToCurrPath( self, oldSelf ):
+         """
+         for move operation....  copy old fs object to new location.
+         """
+         oldPath = oldSelf.fs_object_path
+         newPath = self.fs_object_path
+         oldDir, oldFile = os.path.split(oldPath)
+         newDir, newFile = os.path.split(newPath)
+         
+         if not os.path.isDir(newDir):
+             os.makedirs( newDIr )
+         
+         os.system("mv %s %s" % (oldPath, newPath))
  
  class ZApp_CMF_FSImage( ZApp_CMF_FSObject):