[Erp5-report] r16304 - /erp5/trunk/products/ERP5SyncML/
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Sep 12 16:58:25 CEST 2007
Author: nicolas
Date: Wed Sep 12 16:58:24 2007
New Revision: 16304
URL: http://svn.erp5.org?rev=16304&view=rev
Log:
add tag in activities, use list comprehension
Modified:
erp5/trunk/products/ERP5SyncML/Publication.py
erp5/trunk/products/ERP5SyncML/SynchronizationTool.py
Modified: erp5/trunk/products/ERP5SyncML/Publication.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/Publication.py?rev=16304&r1=16303&r2=16304&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/Publication.py (original)
+++ erp5/trunk/products/ERP5SyncML/Publication.py Wed Sep 12 16:58:24 2007
@@ -221,16 +221,15 @@
"""
Delete a subscriber for this publication
"""
+ if subscription_url in [o.getSubscriptionUrl() for o in self.getSubscriberList()]:
+ self.manage_delObjects(o.id)
+
+ def resetAllSubscribers(self):
+ """
+ Reset all subscribers
+ """
for o in self.getSubscriberList():
- if o.getSubscriptionUrl() == subscription_url:
- self.activate().manage_delObjects(o.id)
-
- def resetAllSubscribers(self):
- """
- Reset all subscribers
- """
- for o in self.getSubscriberList():
- self.activate(activity='SQLQueue').manage_delObjects(o.id)
+ self.activate(activity='SQLQueue', tag=self.getId()).manage_delObjects(o.id)
def getConflictList(self):
"""
Modified: erp5/trunk/products/ERP5SyncML/SynchronizationTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/SynchronizationTool.py?rev=16304&r1=16303&r2=16304&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/SynchronizationTool.py (original)
+++ erp5/trunk/products/ERP5SyncML/SynchronizationTool.py Wed Sep 12 16:58:24 2007
@@ -859,7 +859,9 @@
#use activities to send send an http response
#LOG('sendResponse, will start sendHttpResponse, xml', DEBUG, '')
activity = self.getActivityType(domain=domain)
- self.activate(activity=activity).sendHttpResponse(sync_id=sync_id,
+ self.activate(activity=activity,
+ tag = domain.getId()).sendHttpResponse(
+ sync_id=sync_id,
to_url=to_url,
xml=xml,
domain_path=domain.getPath(),
@@ -938,7 +940,8 @@
result = url_file.read()
except socket.error, msg:
activity = self.getActivityType(domain=domain)
- self.activate(activity=activity).sendHttpResponse(
+ self.activate(activity=activity,
+ tag = domain.getId()).sendHttpResponse(
to_url=to_url,
sync_id=sync_id,
xml=xml,
@@ -974,7 +977,9 @@
user = uf.getUserById(user_id).__of__(uf)
newSecurityManager(None, user)
activity = self.getActivityType(domain=subscription)
- subscription.activate(activity=activity).SubSync(subscription.getPath())
+ subscription.activate(activity=activity,
+ tag = subscription.getId()
+ ).SubSync(subscription.getPath())
security.declarePublic('readResponse')
def readResponse(self, text='', sync_id=None, to_url=None, from_url=None):
@@ -1033,7 +1038,9 @@
publication.getTitle()==sync_id:
if publication.getActivityEnabled():
#use activities to send SyncML data.
- publication.activate(activity='SQLDict').PubSync(
+ activity = self.getActivityType(domain=publication)
+ publication.activate(activity=activity,
+ tag=publication.getId()).PubSync(
publication.getPath(),
text)
return ' '
@@ -1050,8 +1057,10 @@
subscription.getTitle() == sync_id:
subscription_path = subscription.getPath()
activity = self.getActivityType(domain=subscription)
- self.activate(activity=activity).SubSync(subscription_path,
- text)
+ self.activate(activity=activity,
+ tag=subscription.getId()).SubSync(
+ subscription_path,
+ text)
return ' '
# we use from only if we have a file
More information about the Erp5-report
mailing list