[Erp5-report] r16302 - /erp5/trunk/products/ERP5SyncML/Subscription.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Wed Sep 12 16:53:45 2007
New Revision: 16302

URL: http://svn.erp5.org?rev=16302&view=rev
Log:
add tag in activity, raise KeyError when Subscription is misconfigured

Modified:
    erp5/trunk/products/ERP5SyncML/Subscription.py

Modified: erp5/trunk/products/ERP5SyncML/Subscription.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/Subscription.py?rev=16302&r1=16301&r2=16302&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/Subscription.py (original)
+++ erp5/trunk/products/ERP5SyncML/Subscription.py Wed Sep 12 16:53:45 2007
@@ -1106,12 +1106,14 @@
         query_list = query_method(**kw)
       else:
         LOG('This Subscriber %s provide no Query with id :' % (self.getTitle()), INFO, query)
+        raise KeyError
     elif callable(query): # used in the test
       query_list = query(destination)
     else:
       LOG('This Subscriber %s provide no Query with id :' % (self.getTitle()), INFO, query)
+      raise KeyError
     return [x for x in query_list
-              if not getattr(x,'_conflict_resolution', False)]
+              if not getattr(x, '_conflict_resolution', False)]
 
   def generateNewIdWithGenerator(self, object=None, gid=None):
     """
@@ -1342,7 +1344,8 @@
     object_list_len = len(object_id_list)
     for i in xrange(0, object_list_len, 100):
       current_id_list = object_id_list[i:i+100]
-      self.activate(activity='SQLQueue').manage_delObjects(current_id_list)
+      self.activate(activity='SQLQueue',
+                          tag = self.getId()).manage_delObjects(current_id_list)
 
   def getConflictList(self):
     """