Commit 65061492 authored by Nicolas Delaby's avatar Nicolas Delaby

Add new method calling at the end of synchronisation session if One Way Sync...

Add new method calling at the end of synchronisation session if One Way Sync From Server is used. This method delete not synchronised Objects

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17322 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 6e1fc514
...@@ -797,7 +797,7 @@ class XMLSyncUtilsMixin(SyncCode): ...@@ -797,7 +797,7 @@ class XMLSyncUtilsMixin(SyncCode):
local_gid_list.append(b16encode(gid)) local_gid_list.append(b16encode(gid))
#LOG('getSyncMLData :', DEBUG,'gid_not_encoded_list:%s, local_gid_list:%s, gid:%s' % (gid_not_encoded_list, local_gid_list, gid)) #LOG('getSyncMLData :', DEBUG,'gid_not_encoded_list:%s, local_gid_list:%s, gid:%s' % (gid_not_encoded_list, local_gid_list, gid))
else: else:
local_gid_list = map(lambda x: domain.getGidFromObject(x),object_list) local_gid_list = [domain.getGidFromObject(x) for x in object_list]
# Objects to remove # Objects to remove
#LOG('getSyncMLData remove object to remove ...', DEBUG, '') #LOG('getSyncMLData remove object to remove ...', DEBUG, '')
...@@ -1480,6 +1480,21 @@ class XMLSyncUtils(XMLSyncUtilsMixin): ...@@ -1480,6 +1480,21 @@ class XMLSyncUtils(XMLSyncUtilsMixin):
remote_xml, xml_list, has_status_list, remote_xml, xml_list, has_status_list,
has_response) has_response)
def deleteRemainObjectList(self, domain, subscriber):
"""
This method allow deletion on not synchronised Objects at the end of Synchronisation session.
Usefull only after reseting in One Way Sync
"""
object_list = domain.getObjectList()
gid_list = [domain.getGidFromObject(x) for x in object_list]
destination = self.unrestrictedTraverse(domain.getDestinationPath())
conduit_name = subscriber.getConduit()
conduit = self.getConduitByName(conduit_name)
for gid in gid_list:
if gid not in subscriber.getGidList():
object_id = b16decode(gid)
conduit.deleteObject(object=destination, object_id=object_id)
def activateSyncModif(self, **kw): def activateSyncModif(self, **kw):
domain = self.unrestrictedTraverse(kw['domain_relative_url']) domain = self.unrestrictedTraverse(kw['domain_relative_url'])
subscriber = self.unrestrictedTraverse(kw['subscriber_relative_url']) subscriber = self.unrestrictedTraverse(kw['subscriber_relative_url'])
...@@ -1566,6 +1581,8 @@ class XMLSyncUtils(XMLSyncUtilsMixin): ...@@ -1566,6 +1581,8 @@ class XMLSyncUtils(XMLSyncUtilsMixin):
content_type=domain.getSyncContentType()) content_type=domain.getSyncContentType())
has_response = 1 has_response = 1
else: else:
if domain.isOneWayFromServer():
self.deleteRemainObjectList(domain, subscriber)
LOG('this is the end of the synchronisation session !!!', INFO, domain.getId()) LOG('this is the end of the synchronisation session !!!', INFO, domain.getId())
domain.setAuthenticated(False) domain.setAuthenticated(False)
return {'has_response':has_response, 'xml':xml_a} return {'has_response':has_response, 'xml':xml_a}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment