Pour des requêtes passées avec ajax, il vaut mieux toujours définir la balise <base...

[Plinn.git] / Folder.py

diff --git a/Folder.py b/Folder.py
index 2458bf1..2c498c6 100644 (file)
--- a/Folder.py
+++ b/Folder.py
@@ -31,6 +31,7 @@ from zExceptions import Unauthorized
 import sys
 import warnings
 from cgi import escape
 import sys
 import warnings
 from cgi import escape

+from urllib import unquote

 from OFS import Moniker
 from ZODB.POSException import ConflictError
 import OFS.subscribers
 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.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
 from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
 
 from zope.interface import implements


@@ -297,8 +299,7 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) :
         """
 
         self.dav__init(REQUEST, RESPONSE)
         """
 
         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', '')
         validId = makeValidId(self, fileName, allow_dup=True)
 
         ifhdr = REQUEST.get_header('If', '')


@@ -322,9 +323,16 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) :
             typ, enc=guess_content_type(validId, body)
 
         if self.checkIdAvailable(validId) :
             typ, enc=guess_content_type(validId, body)
 
         if self.checkIdAvailable(validId) :

-            ob = self.PUT_factory(validId, typ, body)
-            self._setObject(validId, ob)
-            ob = self._getOb(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
             httpRespCode = 201
         else :
             httpRespCode = 200


@@ -343,13 +351,19 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) :
         ob.PUT(REQUEST, RESPONSE)
         ob.orig_name = fileName
         
         ob.PUT(REQUEST, RESPONSE)
         ob.orig_name = fileName
         

-        
+        # get method from ob created / refreshed

         ti = ob.getTypeInfo()
         method_id = ti.queryMethodID('jsupload_snippet')
         ti = ob.getTypeInfo()
         method_id = ti.queryMethodID('jsupload_snippet')

-        meth = method_id and getattr(ob, method_id) or (lambda : 'Not implemented')
+        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')
         RESPONSE.setStatus(httpRespCode)
         RESPONSE.setHeader('Content-Type', 'text/xml;;charset=utf-8')

-        return '<fragment>%s></fragment>' % meth().strip()
+        return '<fragment>%s</fragment>' % meth(ob).strip()

 
     
 #   ## overload to maintain ownership if authenticated user has 'Manage portal' permission
 
     
 #   ## overload to maintain ownership if authenticated user has 'Manage portal' permission