X-Git-Url: https://scm.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/a8d9cafde69dd2360870cc971f8e7393c4f5a0de..2039a4daf31855d9dd052b5a354ef2c0214921ca:/Folder.py?ds=sidebyside

diff --git a/Folder.py b/Folder.py
index 4db6725..2c498c6 100644
--- a/Folder.py
+++ b/Folder.py
@@ -58,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
@@ -322,9 +323,16 @@ 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)
             httpRespCode = 201
         else :
             httpRespCode = 200
@@ -351,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')