noms de fichiers encodés.

[Plinn.git] / Folder.py

diff --git a/Folder.py b/Folder.py
index c3ca6f7..4db6725 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


@@ -297,8 +298,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', '')


@@ -325,7 +325,9 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) :
             ob = self.PUT_factory(validId, typ, body)
             self._setObject(validId, ob)
             ob = self._getOb(validId)
             ob = self.PUT_factory(validId, typ, body)
             self._setObject(validId, ob)
             ob = self._getOb(validId)

+            httpRespCode = 201

         else :
         else :

+            httpRespCode = 200

             ob = self._getOb(validId)
 
         # We call _verifyObjectPaste with verify_src=0, to see if the
             ob = self._getOb(validId)
 
         # We call _verifyObjectPaste with verify_src=0, to see if the


@@ -340,10 +342,20 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) :
 
         ob.PUT(REQUEST, RESPONSE)
         ob.orig_name = fileName
 
         ob.PUT(REQUEST, RESPONSE)
         ob.orig_name = fileName

-
-        RESPONSE.setStatus(201)
-        RESPONSE.setBody('')
-        return RESPONSE
+        
+        # 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 : 'Not implemented'
+
+        RESPONSE.setStatus(httpRespCode)
+        RESPONSE.setHeader('Content-Type', 'text/xml;;charset=utf-8')
+        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