small cleanup

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@711 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5SyncML/SubscriptionSynchronization.py

@@ -88,7 +88,7 @@ class SubscriptionSynchronization(XMLSyncUtils):
     response = None #check if subsync replies to this messages
     subscription = self.getSubscription(id)
 
-    if msg==None:
+    if msg==None and (subscription.getSubscriptionUrl()).find('file')>=0:
       msg = self.readResponse(sync_id=id,from_url=subscription.getSubscriptionUrl())
     if msg==None:
       response = self.SubSyncInit(self.getSubscription(id))
@@ -112,11 +112,4 @@ class SubscriptionSynchronization(XMLSyncUtils):
     return self.SyncModif(subscription, xml_client)
 
 
-  #def SubLastSync(self, subscription, xml_client=None, RESPONSE=None):
-  #  """
-  #    Now we can read the last response of the server
-  #  """
-  #  self.SyncModif(subscription,xml_client)
-  #  if RESPONSE is not None:
-  #    RESPONSE.redirect('manageSubscriptions')
 

product/ERP5SyncML/SynchronizationTool.py

@@ -45,8 +45,7 @@ from SubscriptionSynchronization import SubscriptionSynchronization
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.SecurityManagement import noSecurityManager
 from AccessControl.User import UnrestrictedUser
-#import sys
-#import StringIO
+from Acquisition import aq_base
 import urllib
 import urllib2
 import os
@@ -551,6 +550,7 @@ class SynchronizationTool( UniqueObject, SimpleItem,
           if domain.domain_type == self.PUB:
             return None
           # we will send an http response
+          domain = aq_base(domain)
           self.activate(activity='RAMQueue').sendHttpResponse(sync_id=sync_id,
                                            to_url=to_url,
                                            xml=xml, domain=domain)
@@ -612,8 +612,6 @@ class SynchronizationTool( UniqueObject, SimpleItem,
           uf = self.acl_users
           user = UnrestrictedUser('syncml','syncml',['Manager','Member'],'')
           newSecurityManager(None, user)
-          get_transaction().commit()
-          #self.activate(activity='RAMQueue').SubSync(sync_id,result)
           self.activate(activity='RAMQueue').readResponse(sync_id=sync_id,text=result)
 
   security.declarePublic('sync')

product/ERP5SyncML/XMLSyncUtils.py

@@ -792,6 +792,7 @@ class XMLSyncUtilsMixin(SyncCode, ActiveObject):
         signature.setStatus(self.PARTIAL)
         #LOG('SyncModif',0,'setPartialXML: %s' % str(previous_partial))
         previous_partial = signature.getPartialXML() or ''
+        if previous_partial.find(partial_data)<0:
           previous_partial += partial_data
         signature.setPartialXML(previous_partial)
         #LOG('SyncModif',0,'previous_partial: %s' % str(previous_partial))