[Erp5-report] r37017 nicolas - /erp5/trunk/products/ERP5/Tool/ContributionTool.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri Jul  9 15:09:35 2010
New Revision: 37017

URL: http://svn.erp5.org?rev=37017&view=rev
Log:
Change id generation of Documentsftech from catalog with
uid + Standard File Name
It enables displaying extension of document in webdav browser and associate
viewer program to document nicer.

Modified:
    erp5/trunk/products/ERP5/Tool/ContributionTool.py

Modified: erp5/trunk/products/ERP5/Tool/ContributionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Tool/ContributionTool.py?rev=37017&r1=37016&r2=37017&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/ContributionTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Tool/ContributionTool.py [utf8] Fri Jul  9 15:09:35 2010
@@ -424,7 +424,9 @@ class ContributionTool(BaseTool):
       return result
 
     # Return an object listed by listDAVObjects
-    uid = str(id).split('-')[-1]
+    # ids are concatenation of uid + '-' + standard file name of documents
+    # get the uid
+    uid = str(id).split('-', 1)[0]
     object = self.getPortalObject().portal_catalog.unrestrictedGetResultValue(uid=uid)
     if object is not None:
       return object.getObject() # Make sure this does not break security. XXX
@@ -451,12 +453,8 @@ class ContributionTool(BaseTool):
     def wrapper(o_list):
       for o in o_list:
         o = o.getObject()
-        reference = o.getReference()
-        if reference:
-          id = '%s-%s' % (reference, o.getUid())
-        else:
-          id = '%s' % o.getUid()
-        yield o.getObject().asContext(id=id)
+        id = '%s-%s' % (o.getUid(), o.getStandardFileName(),)
+        yield o.asContext(id=id)
 
     return wrapper(object_list)