[Erp5-report] r15202 - in /erp5/trunk/products/ERP5SyncML: ./ dtml/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jul 12 13:47:02 CEST 2007
Author: seb
Date: Thu Jul 12 13:47:02 2007
New Revision: 15202
URL: http://svn.erp5.org?rev=15202&view=rev
Log:
- update the explanation
- use SQLDict
- correct a bug
Modified:
erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py
erp5/trunk/products/ERP5SyncML/dtml/explainSynchronizationTool.dtml
Modified: erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py?rev=15202&r1=15201&r2=15202&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py (original)
+++ erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py Thu Jul 12 13:47:02 2007
@@ -689,6 +689,8 @@
actual xupdate on the signature.
"""
#LOG('getSyncMLData starting...',0,'')
+ if isinstance(conduit, str):
+ conduit = self.getConduitByName(conduit)
local_gid_list = []
syncml_data = kw.get('syncml_data','')
result = {'finished':1}
@@ -1034,7 +1036,7 @@
remote_xml=action)
cmd_id +=1
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 current xupdate from the last synchronization
string_io = StringIO()
@@ -1316,7 +1318,7 @@
string_io = StringIO()
PrettyPrint(remote_xml,stream=string_io)
remote_xml = string_io.getvalue()
- self.activate(activity='RAMQueue').SyncModifActivity(
+ self.activate(activity='SQLQueue').SyncModifActivity(
domain_relative_url = domain.getRelativeUrl(),
remote_xml = remote_xml,
subscriber_relative_url = subscriber.getRelativeUrl(),
@@ -1356,7 +1358,7 @@
finished = result['finished']
#LOG('finished =',0,finished)
if not finished:
- self.activate(activity='RAMQueue').SyncModifActivity(**kw)
+ self.activate(activity='SQLQueue').SyncModifActivity(**kw)
else:
xml_confirmation = result['xml_confirmation']
cmd_id = result['cmd_id']
Modified: erp5/trunk/products/ERP5SyncML/dtml/explainSynchronizationTool.dtml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/dtml/explainSynchronizationTool.dtml?rev=15202&r1=15201&r2=15202&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/dtml/explainSynchronizationTool.dtml (original)
+++ erp5/trunk/products/ERP5SyncML/dtml/explainSynchronizationTool.dtml Thu Jul 12 13:47:02 2007
@@ -38,21 +38,58 @@
Subscription's elements :</br>
- id : the id of the subscription</br>
- publication_url : the server's adrress mail</br>
- subscription_url : the client's address mail</br>
- destination_path : the path where are yours objects</br>
- query : the type of objects you want to synchronize</br>
- xml_mapping : the page template used on each object before an export</br></br>
+ <b>Title :</b> the title used to identify the Subscription</br>
+ <b>Use Activity :</b> activate or not the use of activity.</br>
+ <b>Publication Url :</b> the server's adrress mail</br>
+ <b>Subscription Url :</b> the client's address mail</br>
+ <b>Destination Path :</b> the path where are yours objects</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>
- id : the id of the subscription</br>
- publication_url : the server's adrress mail</br>
- destination_path : the path where are yours objects</br>
- query : the type of objects you want to synchronize</br>
- xml_mapping : the page template used on each object before an export</br>
-
+ <b>Title :</b> the title used to identify the Subscription</br>
+ <b>Use Activity :</b> activate or not the use of activity.</br>
+ <b>Publication Url :</b> the server's adrress mail</br>
+ <b>Destination Path :</b> the path where are yours objects</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>
<dtml-var manage_page_footer>
More information about the Erp5-report
mailing list