[Erp5-report] r25407 - /erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Sun Feb 1 22:41:50 CET 2009
Author: nicolas
Date: Sun Feb 1 22:41:49 2009
New Revision: 25407
URL: http://svn.erp5.org?rev=25407&view=rev
Log:
Fix some mistakes introduced in r25205
Modified:
erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py
Modified: erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py?rev=25407&r1=25406&r2=25407&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py [utf8] (original)
+++ erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py [utf8] Sun Feb 1 22:41:49 2009
@@ -239,7 +239,7 @@
xml.append(E.MsgRef('%s' % message_id))
if cmd_ref:
xml.append(E.CmdRef('%s' % cmd_ref))
- xml.append(E.Meta(E.Type('application/vnd.syncml-devinf+xml')),
+ xml.extend((E.Meta(E.Type('application/vnd.syncml-devinf+xml')),
E.Item(E.Source(E.LocURI('./devinf11')),
E.Data(E.DevInf(
E.VerDTD('1.1'),
@@ -250,29 +250,27 @@
E.DevID(subscription.getSubscriptionUrl()),
E.DevTyp('workstation'),
E.UTC(),
- E.DataStore(
- E.SourceRef(subscription.getSourceURI()),
- Element('E.Rx-Pref').append(
- (E.CTType(conduit.getPreferedCapabilitieCTType()),
- E.VerCT(conduit.getPreferedCapabilitieVerCT()))
- )
- )
+ E.DataStore(E.SourceRef(subscription.getSourceURI()))
)
)
- ))
- data_store = xml.find('DataStore')
+ )))
+ data_store = xml.find('Item/Data/DevInf/DataStore')
tx_element_list = []
rx_element_list = []
for type in conduit.getCapabilitiesCTTypeList():
if type != self.MEDIA_TYPE['TEXT_XML']:
- for tx_version in conduit.getCapabilitiesVerCTList(type):
- rx_element_list.append(E.Rx(E.CTType(type), E.VerCT(rx_version)))
- tx_element_list.append(E.Tx(E.CTType(type), E.VerCT(rx_version)))
+ for x_version in conduit.getCapabilitiesVerCTList(type):
+ rx_element_list.append(E.Rx(E.CTType(type), E.VerCT(x_version)))
+ tx_element_list.append(E.Tx(E.CTType(type), E.VerCT(x_version)))
+ rx_pref = Element('Rx-Pref')
+ rx_pref.extend((E.CTType(conduit.getPreferedCapabilitieCTType()),
+ E.VerCT(conduit.getPreferedCapabilitieVerCT())))
+ data_store.append(rx_pref)
data_store.extend(rx_element_list)
- data_store.append(Element('Tx-Pref').extend(
- (E.CTType(conduit.getPreferedCapabilitieCTType()),
- E.VerCT(conduit.getPreferedCapabilitieVerCT()))
- ))
+ tx_pref = Element('Tx-Pref')
+ tx_pref.extend((E.CTType(conduit.getPreferedCapabilitieCTType()),
+ E.VerCT(conduit.getPreferedCapabilitieVerCT())))
+ data_store.append(tx_pref)
data_store.extend(tx_element_list)
data_store.append(E.SyncCap(
E.SyncType('2'),
More information about the Erp5-report
mailing list