[Zapp-cvs-commit] ZApp/skins/zapp_generic zapp_image_edit.py,1.2,1.3

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

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

Modified Files:
	zapp_image_edit.py 
Log Message:
added FSFolder class

Index: zapp_image_edit.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/skins/zapp_generic/zapp_image_edit.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** zapp_image_edit.py	16 Jan 2004 09:55:34 -0000	1.2
--- zapp_image_edit.py	28 Mar 2004 22:14:47 -0000	1.3
***************
*** 11,50 ****
  
  REQUEST = context.REQUEST
- file = REQUEST.form.get('file','')
- if not file:
-    raise RuntimeError, "I need a file!"
- 
- portal = context.portal_url.getPortalObject()
- path = context.getPhysicalPath()
- 
- oldID = path[-1]
- newID, newTitle = context.zapp_cook_id( REQUEST.get('id',''), REQUEST.get('title',''), file)
- currFolder = portal.fSystem
  
! for folder in path[1:-1]:
!    if folder in currFolder.objectIds('Folder'):
!       fsFolder = getattr(currFolder, folder, None)
!    else:
!        currFolder.manage_addFolder(folder)
!        fsFolder = getattr( currFolder, folder, None)
! 
!    if not fsFolder:
!        raise RuntimeError, "Can't create folder!"
! 
!    currFolder = fsFolder
     
- fileObj = getattr(currFolder, oldID, None)
- 
- if fileObj is None:
-    currFolder.manage_addImage(id=newID, file=file)
-    fileObj = getattr(currFolder, newID, None)
- 
- else:
-    if newID != oldID:
-       currFolder.manage_renameObjects((oldID,), (newID,))
- 
-    fileObj = getattr(currFolder, newID, None)
-    fileObj.manage_upload(file)
- 
  REQUEST.RESPONSE.redirect( "%s/folder_rename?ids:list=%s&new_ids:list=%s&new_titles:list=%s" % (REQUEST.get('URL2'), oldID, newID, newTitle))
  
--- 11,17 ----
  
  REQUEST = context.REQUEST
  
! oldID, newID, newTitle = context.edit_fs_object( id=REQUEST.get('id',''), title=REQUEST.get('title',''), file=REQUEST.form.get('file',None))
     
  REQUEST.RESPONSE.redirect( "%s/folder_rename?ids:list=%s&new_ids:list=%s&new_titles:list=%s" % (REQUEST.get('URL2'), oldID, newID, newTitle))