[Erp5-report] r28225 - /erp5/trunk/products/ERP5SyncML/SynchronizationTool.py

[nobody at svn.erp5.org]

Author: daniele
Date: Thu Jul 30 14:27:35 2009
New Revision: 28225

URL: http://svn.erp5.org?rev=28225&view=rev
Log:
Update activity in RAMQUEUE to SQLQUEUE

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

Modified: erp5/trunk/products/ERP5SyncML/SynchronizationTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/SynchronizationTool.py?rev=28225&r1=28224&r2=28225&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/SynchronizationTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5SyncML/SynchronizationTool.py [utf8] Thu Jul 30 14:27:35 2009
@@ -647,12 +647,13 @@
     subscriber = conflict.getSubscriber()
     publisher_object_path = conflict.getObjectPath()
     publisher_object = self.unrestrictedTraverse(publisher_object_path)
-    publisher_xml = subscriber.getXMLFromObject(publisher_object)
+    conduit_name = subscriber.getConduit()
+    conduit = self.getConduitByName(conduit_name)
+    publisher_xml = conduit.getXMLFromObjectWithId(publisher_object,\
+                    xml_mapping=subscriber.getXMLMapping())
     directory = publisher_object.aq_inner.aq_parent
     object_id = self._getCopyId(publisher_object)
     # Import the conduit and get it
-    conduit_name = subscriber.getConduit()
-    conduit = self.getConduitByName(conduit_name)
     conduit.addNode(
                 xml=publisher_xml,
                 object=directory,
@@ -855,8 +856,7 @@
             return None
           #use activities to send send an http response
           #LOG('sendResponse, will start sendHttpResponse, xml', DEBUG, '')
-          activity = self.getActivityType(domain=domain)
-          self.activate(activity=activity,
+          self.activate(activity='SQLQueue',
                         tag=domain.getId(),
                         priority=self.PRIORITY).sendHttpResponse(
                                               sync_id=sync_id,
@@ -931,8 +931,7 @@
       url_file = urllib2.urlopen(request)
       result = url_file.read()
     except socket.error, msg:
-      activity = self.getActivityType(domain=domain)
-      self.activate(activity=activity,
+      self.activate(activity='SQLQueue',
                     tag=domain.getId(),
                     priority=self.PRIORITY).sendHttpResponse(
                                                   to_url=to_url,
@@ -969,8 +968,7 @@
         uf = self.getPortalObject().acl_users
         user = uf.getUserById(user_id).__of__(uf)
         newSecurityManager(None, user)
-        activity = self.getActivityType(domain=subscription)
-        subscription.activate(activity=activity,
+        subscription.activate(activity='SQLQueue',
                               tag=subscription.getId(),
                               priority=self.PRIORITY
                                   ).SubSync(subscription.getPath())
@@ -1034,8 +1032,7 @@
         publication.getTitle() == sync_id:
           if publication.getActivityEnabled():
             #use activities to send SyncML data.
-            activity = self.getActivityType(domain=publication)
-            publication.activate(activity=activity,
+            publication.activate(activity='SQLQueue',
                                 tag=publication.getId(),
                                 priority=self.PRIORITY).PubSync(
                                                         publication.getPath(),
@@ -1053,14 +1050,12 @@
         if subscription.getSubscriptionUrl() == url and \
             subscription.getTitle() == sync_id:
               subscription_path = subscription.getPath()
-              activity = self.getActivityType(domain=subscription)
-              self.activate(activity=activity,
+              self.activate(activity='SQLQueue',
                             tag=subscription.getId(),
                             priority=self.PRIORITY).SubSync(
                                                       subscription_path,
                                                       text)
               return ' '
-
     # we use from only if we have a file
     elif isinstance(from_url, str):
       if from_url.find('file://') == 0: