X-Git-Url: https://svn.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/9cf1680587dbad588b3f8657b545c65e0aa601dc..a8b15d47c663e72be4c3102486c7b7fdca467901:/Folder.py?ds=sidebyside diff --git a/Folder.py b/Folder.py index ce440f1..8ed3cc3 100644 --- a/Folder.py +++ b/Folder.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ####################################################################################### # Plinn - http://plinn.org # -# Copyright (C) 2005-2007 Benoît PIN # +# Copyright (C) 2005-2014 Benoît Pin # # # # This program is free software; you can redistribute it and/or # # modify it under the terms of the GNU General Public License # @@ -31,6 +31,7 @@ from zExceptions import Unauthorized import sys import warnings from cgi import escape +from urllib import unquote from OFS import Moniker from ZODB.POSException import ConflictError import OFS.subscribers @@ -57,6 +58,7 @@ from Products.CMFCore.utils import _checkPermission, getToolByName from Products.CMFCore.utils import getUtilityByInterfaceName from Products.CMFCore.CMFCatalogAware import CMFCatalogAware from Products.CMFCore.PortalFolder import PortalFolder, ContentFilter +from Products.CMFCore.interfaces import IDublinCore from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl from zope.interface import implements @@ -264,7 +266,9 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) : ctool = getUtilityByInterfaceName('Products.CMFCore.interfaces.ICatalogTool') contentFilter['path'] = {'query':'/'.join(self.getPhysicalPath()), 'depth':1} - return ctool(sort_on='position', **contentFilter) + if not contentFilter.has_key('sort_on') : + contentFilter['sort_index'] = 'position' + return ctool(**contentFilter) security.declarePublic('synContentValues') def synContentValues(self): @@ -297,8 +301,7 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) : """ self.dav__init(REQUEST, RESPONSE) - - fileName = REQUEST.getHeader('X-File-Name', '') + fileName = unquote(REQUEST.getHeader('X-File-Name', '')) validId = makeValidId(self, fileName, allow_dup=True) ifhdr = REQUEST.get_header('If', '') @@ -321,7 +324,21 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) : if typ is None: typ, enc=guess_content_type(validId, body) - ob = self.PUT_factory(validId, typ, body) + if self.checkIdAvailable(validId) : + try : + ob = self.PUT_factory(validId, typ, body) + self._setObject(validId, ob) + ob = self._getOb(validId) + except ValueError : # maybe "Disallowed subobject type". Fallback to file type. + validId = self.invokeFactory('File', validId) + ob = self._getOb(validId) + if IDublinCore.providedBy(ob) : + ob.editMetadata(title=fileName, + format=typ) + httpRespCode = 201 + else : + httpRespCode = 200 + ob = self._getOb(validId) # We call _verifyObjectPaste with verify_src=0, to see if the # user can create this type of object (and we don't need to @@ -333,15 +350,22 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) : (ob.__class__, repr(self), sys.exc_info()[1],) raise Unauthorized, sMsg - # Delegate actual PUT handling to the new object, - # SDS: But just *after* it has been stored. - self._setObject(validId, ob) - ob = self._getOb(validId) ob.PUT(REQUEST, RESPONSE) - - RESPONSE.setStatus(201) - RESPONSE.setBody('') - return RESPONSE + ob.orig_name = fileName + + # get method from ob created / refreshed + ti = ob.getTypeInfo() + method_id = ti.queryMethodID('jsupload_snippet') + meth = getattr(ob, method_id) if method_id else None + if not meth : + # get method from container that receive uploaded content + ti = self.getTypeInfo() + method_id = ti.queryMethodID('jsupload_snippet') + meth = getattr(self, method_id) if method_id else lambda ob : 'Not implemented' + + RESPONSE.setStatus(httpRespCode) + RESPONSE.setHeader('Content-Type', 'text/xml;;charset=utf-8') + return '%s' % meth(ob).strip() # ## overload to maintain ownership if authenticated user has 'Manage portal' permission