Commit bc84ddb5 authored by Sebastien Robin's avatar Sebastien Robin

- update the explanation

- use SQLDict
- correct a bug


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15202 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 4b3e2653
...@@ -689,6 +689,8 @@ class XMLSyncUtilsMixin(SyncCode): ...@@ -689,6 +689,8 @@ class XMLSyncUtilsMixin(SyncCode):
actual xupdate on the signature. actual xupdate on the signature.
""" """
#LOG('getSyncMLData starting...',0,'') #LOG('getSyncMLData starting...',0,'')
if isinstance(conduit, str):
conduit = self.getConduitByName(conduit)
local_gid_list = [] local_gid_list = []
syncml_data = kw.get('syncml_data','') syncml_data = kw.get('syncml_data','')
result = {'finished':1} result = {'finished':1}
...@@ -1034,7 +1036,7 @@ class XMLSyncUtilsMixin(SyncCode): ...@@ -1034,7 +1036,7 @@ class XMLSyncUtilsMixin(SyncCode):
remote_xml=action) remote_xml=action)
cmd_id +=1 cmd_id +=1
if simulate: if simulate:
# This means we are on the publiher side and we want to store # This means we are on the publisher side and we want to store
# the xupdate from the subscriber and we also want to generate # the xupdate from the subscriber and we also want to generate
# the current xupdate from the last synchronization # the current xupdate from the last synchronization
string_io = StringIO() string_io = StringIO()
...@@ -1316,7 +1318,7 @@ class XMLSyncUtils(XMLSyncUtilsMixin): ...@@ -1316,7 +1318,7 @@ class XMLSyncUtils(XMLSyncUtilsMixin):
string_io = StringIO() string_io = StringIO()
PrettyPrint(remote_xml,stream=string_io) PrettyPrint(remote_xml,stream=string_io)
remote_xml = string_io.getvalue() remote_xml = string_io.getvalue()
self.activate(activity='RAMQueue').SyncModifActivity( self.activate(activity='SQLQueue').SyncModifActivity(
domain_relative_url = domain.getRelativeUrl(), domain_relative_url = domain.getRelativeUrl(),
remote_xml = remote_xml, remote_xml = remote_xml,
subscriber_relative_url = subscriber.getRelativeUrl(), subscriber_relative_url = subscriber.getRelativeUrl(),
...@@ -1356,7 +1358,7 @@ class XMLSyncUtils(XMLSyncUtilsMixin): ...@@ -1356,7 +1358,7 @@ class XMLSyncUtils(XMLSyncUtilsMixin):
finished = result['finished'] finished = result['finished']
#LOG('finished =',0,finished) #LOG('finished =',0,finished)
if not finished: if not finished:
self.activate(activity='RAMQueue').SyncModifActivity(**kw) self.activate(activity='SQLQueue').SyncModifActivity(**kw)
else: else:
xml_confirmation = result['xml_confirmation'] xml_confirmation = result['xml_confirmation']
cmd_id = result['cmd_id'] cmd_id = result['cmd_id']
......
...@@ -38,21 +38,58 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -38,21 +38,58 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Subscription's elements :</br> Subscription's elements :</br>
id : the id of the subscription</br> <b>Title :</b> the title used to identify the Subscription</br>
publication_url : the server's adrress mail</br> <b>Use Activity :</b> activate or not the use of activity.</br>
subscription_url : the client's address mail</br> <b>Publication Url :</b> the server's adrress mail</br>
destination_path : the path where are yours objects</br> <b>Subscription Url :</b> the client's address mail</br>
query : the type of objects you want to synchronize</br> <b>Destination Path :</b> the path where are yours objects</br>
xml_mapping : the page template used on each object before an export</br></br> <b>Source URI :</b> source URI of synchronization (in case of
synchronization between two erp5 sites, it's should be the same
as the <b>Title</b>)</br>
<b>Target URI :</b> target URI of synchronization (in case of
synchronization between two erp5 sites, it's should be the same
as the <b>Title</b>)</br>
<b>Query :</b> the type of objects you want to synchronize</br>
<b>XML Mapping :</b> the page template used on each object before
an export</br>
<b>Conduit :</b> the conduit used to synchronize</br>
<b>GPG key name :</b>a name of gpg key to use</br>
<b>Id Generator :</b> This set the method name wich allows to
generate a new id</br>
<b>Gid Generator :</b> This set the method name wich allows to
find a gid from any object</br>
<b>Media Type :</b> the type of media exchanged between publication
and subscription.</br>
<b>Login :</b> the login used to authenticate on the server (could be
empty if there is no authentication on the server)</br>
<b>Password :</b> the password corresponding to the login</br>
</br>
Publication's elements :</br> Publication's elements :</br>
id : the id of the subscription</br> <b>Title :</b> the title used to identify the Subscription</br>
publication_url : the server's adrress mail</br> <b>Use Activity :</b> activate or not the use of activity.</br>
destination_path : the path where are yours objects</br> <b>Publication Url :</b> the server's adrress mail</br>
query : the type of objects you want to synchronize</br> <b>Destination Path :</b> the path where are yours objects</br>
xml_mapping : the page template used on each object before an export</br> <b>Source URI :</b> source URI of synchronization (in case of
synchronization between two erp5 sites, it's should be the same
as the <b>Title</b>)</br>
<b>Query :</b> the type of objects you want to synchronize</br>
<b>XML Mapping :</b> the page template used on each object before
an export</br>
<b>Conduit :</b> the conduit used to synchronize</br>
<b>GPG key name :</b>a name of gpg key to use</br>
<b>Id Generator :</b> This set the method name wich allows to
generate a new id</br>
<b>Gid Generator :</b> This set the method name wich allows to
find a gid from any object</br>
<b>Media Type :</b> the type of media exchanged between publication
and subscription.</br>
<b>Authentication Required :</b> ask authentication to the clients</br>
<b>Authentication Format :</b>the format used to encode the
login and password</br>
<b>Autentication Type :</b> the type of the authentication</br>
</br>
</p> </p>
<dtml-var manage_page_footer> <dtml-var manage_page_footer>
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