X-Git-Url: https://scm.cri.mines-paristech.fr/git/Plinn.git/blobdiff_plain/326a6677709320dc5149de76f6ae2bdea31fe4fa..5f82e5ec02d8806689a45985a5d6e1d6a2f49ff3:/Folder.py

diff --git a/Folder.py b/Folder.py
index 8691fcf..2c498c6 100644
--- a/Folder.py
+++ b/Folder.py
@@ -323,9 +323,13 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) :
             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)
@@ -355,7 +359,7 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) :
             # 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'
+            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')