Édition de l'url du serveur Solr.

[Plinn.git] / Folder.py

diff --git a/Folder.py b/Folder.py
index 8691fcf..8ed3cc3 100644 (file)
--- a/Folder.py
+++ b/Folder.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #######################################################################################
 #   Plinn - http://plinn.org                                                          #
 # -*- coding: utf-8 -*-
 #######################################################################################
 #   Plinn - http://plinn.org                                                          #

-#   Copyright (C) 2005-2007  Benoît PIN <benoit.pin@ensmp.fr>                         #
+#   Copyright (C) 2005-2014  Benoît Pin <benoit.pin@ensmp.fr>                         #

 #                                                                                     #
 #   This program is free software; you can redistribute it and/or                     #
 #   modify it under the terms of the GNU General Public License                       #
 #                                                                                     #
 #   This program is free software; you can redistribute it and/or                     #
 #   modify it under the terms of the GNU General Public License                       #


@@ -266,7 +266,9 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) :
         ctool = getUtilityByInterfaceName('Products.CMFCore.interfaces.ICatalogTool')
         contentFilter['path'] = {'query':'/'.join(self.getPhysicalPath()),
                                 'depth':1}
         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):
 
     security.declarePublic('synContentValues')
     def synContentValues(self):


@@ -323,9 +325,13 @@ 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)
             if IDublinCore.providedBy(ob) :
                 ob.editMetadata(title=fileName,
                                 format=typ)


@@ -355,7 +361,7 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) :
             # get method from container that receive uploaded content
             ti = self.getTypeInfo()
             method_id = ti.queryMethodID('jsupload_snippet')
             # 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')
 
         RESPONSE.setStatus(httpRespCode)
         RESPONSE.setHeader('Content-Type', 'text/xml;;charset=utf-8')