[Erp5-report] r16410 - /erp5/trunk/products/ERP5Type/Core/Folder.py

[nobody at svn.erp5.org]

Author: seb
Date: Mon Sep 17 16:27:23 2007
New Revision: 16410

URL: http://svn.erp5.org?rev=16410&view=rev
Log:
- rename method_id attribute to __name__ in order to make 
  FolderMethodWrapper compatible with WorkflowMethods
- use random ids for _generatePerDayId

Modified:
    erp5/trunk/products/ERP5Type/Core/Folder.py

Modified: erp5/trunk/products/ERP5Type/Core/Folder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/Folder.py?rev=16410&r1=16409&r2=16410&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py Mon Sep 17 16:27:23 2007
@@ -166,15 +166,10 @@
   def _generatePerDayId(self):
     """
     Generate id base on date, useful for HBTreeFolder
+    We also append random id
     """
     current_date = str(DateTime().Date()).replace("/", "")
-    try:
-      my_id = int(self.getLastId())
-    except TypeError:
-      my_id = 1
-    while self.hasContent("%s-%s" %(current_date, my_id)):
-      my_id = my_id + 1
-    my_id = str(my_id)
+    my_id = self._generateRandomId()
     self._setLastId(my_id) # Make sure no reindexing happens
     return "%s-%s" %(current_date, my_id)
     
@@ -339,7 +334,7 @@
   This a wrapper between folder method and folder type method
   """
   def __init__(self, method_id):
-    self.method_id = method_id
+    self.__name__ = method_id
 
   def __call__(self, folder, *args, **kw):
     folder_handler = getattr(folder, '_folder_handler', None)
@@ -349,7 +344,8 @@
       folder.initializeFolderHandler()
       folder_handler = getattr(folder, '_folder_handler', None)
       handler = folder_handler_dict.get(folder_handler,None)
-    return getattr(handler, self.method_id)(folder, *args, **kw)
+    return getattr(handler, self.__name__)(folder, *args, **kw)
+  
 
 class FolderHandler: