Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alecs_myu
erp5
Commits
2d2c38f9
Commit
2d2c38f9
authored
Jun 28, 2013
by
Aurel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
implement better deletion mecanism & remove workflow transition overhead
parent
1b4cd9c7
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
323 additions
and
219 deletions
+323
-219
product/ERP5SyncML/Document/SyncMLSubscription.py
product/ERP5SyncML/Document/SyncMLSubscription.py
+276
-169
product/ERP5SyncML/Engine/AsynchronousEngine.py
product/ERP5SyncML/Engine/AsynchronousEngine.py
+15
-19
product/ERP5SyncML/Engine/EngineMixin.py
product/ERP5SyncML/Engine/EngineMixin.py
+7
-6
product/ERP5SyncML/Engine/SynchronousEngine.py
product/ERP5SyncML/Engine/SynchronousEngine.py
+9
-11
product/ERP5SyncML/Tool/SynchronizationTool.py
product/ERP5SyncML/Tool/SynchronizationTool.py
+9
-13
product/ERP5SyncML/tests/testERP5SyncML.py
product/ERP5SyncML/tests/testERP5SyncML.py
+7
-1
No files found.
product/ERP5SyncML/Document/SyncMLSubscription.py
View file @
2d2c38f9
...
@@ -28,7 +28,6 @@
...
@@ -28,7 +28,6 @@
##############################################################################
##############################################################################
from
base64
import
b16encode
,
b16decode
from
base64
import
b16encode
,
b16decode
from
warnings
import
warn
from
logging
import
getLogger
from
logging
import
getLogger
from
urlparse
import
urlparse
from
urlparse
import
urlparse
from
lxml
import
etree
from
lxml
import
etree
...
@@ -66,6 +65,8 @@ syncml_logger = getLogger('ERP5SyncML')
...
@@ -66,6 +65,8 @@ syncml_logger = getLogger('ERP5SyncML')
MAX_OBJECT_PER_MESSAGE
=
300
MAX_OBJECT_PER_MESSAGE
=
300
RETRO_COMPATIBLE
=
True
_MARKER
=
[]
_MARKER
=
[]
class
SyncMLSubscription
(
XMLObject
):
class
SyncMLSubscription
(
XMLObject
):
"""
"""
...
@@ -99,6 +100,82 @@ class SyncMLSubscription(XMLObject):
...
@@ -99,6 +100,82 @@ class SyncMLSubscription(XMLObject):
self
.
logout
()
self
.
logout
()
self
.
_edit
(
authenticated_user
=
None
)
self
.
_edit
(
authenticated_user
=
None
)
security
.
declarePrivate
(
'getAndIndex'
)
def
getAndIndex
(
self
,
callback
,
method_kw
,
activate_kw
,
**
kw
):
"""
This methods is called by the asynchronous engine to index source
data in sql table
callback : method to call in activity
method_kw : callback's parameters
activate_kw : activity parameters to pass to activate call
kw : any parameter getAndActivate can required if it calls itself
"""
search_kw
=
dict
(
kw
)
packet_size
=
search_kw
.
pop
(
'packet_size'
,
30
)
limit
=
packet_size
*
search_kw
.
pop
(
'activity_count'
,
100
)
try
:
r
=
self
.
getDocumentIdList
(
limit
=
limit
,
**
search_kw
)
# It is assumed that
# the result is sorted
except
TypeError
:
if
not
RETRO_COMPATIBLE
:
raise
else
:
syncml_logger
.
warning
(
"Script %s does not accept paramaters limit=%s kw=%s"
%
(
self
.
getListMethodId
(),
limit
,
search_kw
,))
r
=
self
.
getDocumentList
()
# It is assumed that
# the result is sorted
result_count
=
len
(
r
)
generated_other_activity
=
False
if
result_count
:
syncml_logger
.
info
(
"getAndIndex : got %d, %r result, limit = %d, packet %d"
%
(
result_count
,
r
,
limit
,
packet_size
))
if
result_count
==
limit
:
# Recursive call to prevent too many activity generation
next_kw
=
dict
(
activate_kw
,
priority
=
1
+
activate_kw
.
get
(
'priority'
,
1
))
kw
[
"min_id"
]
=
r
[
-
1
].
getId
()
syncml_logger
.
info
(
"--> calling getAndActivate in activity, min = %s"
%
(
kw
[
"min_id"
],))
self
.
activate
(
**
next_kw
).
getAndActivate
(
callback
,
method_kw
,
activate_kw
,
**
kw
)
generated_other_activity
=
True
r
=
[
x
.
getPath
()
for
x
in
r
]
activate
=
self
.
getPortalObject
().
portal_synchronizations
.
activate
callback_method
=
getattr
(
activate
(
**
activate_kw
),
callback
)
if
generated_other_activity
:
for
i
in
xrange
(
0
,
result_count
,
packet_size
):
syncml_logger
.
info
(
"-- getAndIndex : recursive call, generating for %s"
%
(
r
[
i
:
i
+
packet_size
],))
callback_method
(
path_list
=
r
[
i
:
i
+
packet_size
],
activate_kw
=
activate_kw
,
**
method_kw
)
else
:
if
result_count
>
packet_size
:
for
i
in
xrange
(
0
,
result_count
-
packet_size
,
packet_size
):
syncml_logger
.
info
(
"-- getAndIndex : i %s, call, generating for %s : %s"
%
(
i
,
r
[
i
:
i
+
packet_size
],
activate_kw
))
callback_method
(
path_list
=
r
[
i
:
i
+
packet_size
],
**
method_kw
)
final_min
=
i
+
packet_size
else
:
final_min
=
0
syncml_logger
.
info
(
"---- getAndIndex : final call for %s %s : %s"
\
%
(
final_min
,
r
[
final_min
:],
activate_kw
))
callback_method
(
path_list
=
r
[
final_min
:],
activate_kw
=
activate_kw
,
**
method_kw
)
return
result_count
security
.
declarePrivate
(
'getSearchableSourcePath'
)
def
getSearchableSourcePath
(
self
):
"""
Return the path of the subscription that will be used in sql table
_ char must be escaped because of the LIKE behaviour
"""
return
"%s%%"
%
(
self
.
getSourceValue
().
getPath
().
replace
(
"_"
,
"
\
_
"
),)
security.declarePrivate('getAndActivate')
security.declarePrivate('getAndActivate')
def getAndActivate(self, callback, method_kw, activate_kw, **kw):
def getAndActivate(self, callback, method_kw, activate_kw, **kw):
"""
"""
...
@@ -121,59 +198,81 @@ class SyncMLSubscription(XMLObject):
...
@@ -121,59 +198,81 @@ class SyncMLSubscription(XMLObject):
search_kw = dict(kw)
search_kw = dict(kw)
packet_size = search_kw.pop('packet_size', 30)
packet_size = search_kw.pop('packet_size', 30)
limit = packet_size * search_kw.pop('activity_count', 100)
limit = packet_size * search_kw.pop('activity_count', 100)
try
:
r
=
self
.
getDocumentIdList
(
limit
=
limit
,
**
search_kw
)
# It is assumed that
# We must know if we have a lower limit or not to propagate
# the result is sorted
if not kw.has_key("
strict_min_gid
"):
except
TypeError
:
first_call = True
syncml_logger
.
warning
(
"Script %s does not accept paramaters limit=%s kw=%s"
%
else:
(
self
.
getListMethodId
(),
limit
,
search_kw
,))
first_call = False
r
=
self
.
getDocumentList
()
# It is assumed that
# the result is sorted
search_kw.update({"
stict_min_gid
" : None,
"
min_gid
" : None,
"
max_gid
" : None,
"
limit
" : limit,
"
path
" : self.getSearchableSourcePath()})
r = [x.gid for x in self.z_get_syncml_gid_list(**search_kw)]
result_count = len(r)
result_count = len(r)
generated_other_activity = False
generated_other_activity = False
if result_count:
if result_count:
syncml_logger
.
debug
(
"getAndActivate : got %d result, limit = %d, packet %d"
%
syncml_logger.info("
getAndActivate
:
got
%
d
result
" % (result_count,))
(
result_count
,
limit
,
packet_size
))
if result_count == limit:
if result_count == limit:
# Recursive call to prevent too many activity generation
# Recursive call to prevent too many activity generation
next_kw = dict(activate_kw, priority=1+activate_kw.get('priority', 1))
next_kw = dict(activate_kw, priority=1+activate_kw.get('priority', 1))
kw
[
"min_id"
]
=
r
[
-
1
].
getId
()
kw["
strict_min_gid
"] = r[-1]
syncml_logger
.
debug
(
"--> calling getAndActivate in activity, min = %s"
%
syncml_logger.info("
-->
calling
getAndActivate
in
activity
,
min
=
%
s
" %
(
kw
[
"min_id"
],))
(kw["
min_gid
"],))
self.activate(**next_kw).getAndActivate(
self.activate(**next_kw).getAndActivate(
callback, method_kw, activate_kw, **kw)
callback, method_kw, activate_kw, **kw)
generated_other_activity = True
generated_other_activity = True
r
=
[
x
.
getId
()
for
x
in
r
]
message_id_list = self.getNextMessageIdList(id_count=result_count)
message_id_list = self.getNextMessageIdList(id_count=result_count)
# XXX maybe (result_count / packet_size) + 1 instead of result_count
# XXX maybe (result_count / packet_size) + 1 instead of result_count
message_id_list.reverse() # We pop each id in the following loop
message_id_list.reverse() # We pop each id in the following loop
activate = self.getPortalObject().portal_synchronizations.activate
activate = self.getPortalObject().portal_synchronizations.activate
callback_method = getattr(activate(**activate_kw), callback)
callback_method = getattr(activate(**activate_kw), callback)
if generated_other_activity:
if generated_other_activity:
# XXX Can be factorized with following code
# upper_limit of xrange + some check ???
for i in xrange(0, result_count, packet_size):
for i in xrange(0, result_count, packet_size):
syncml_logger
.
debug
(
"-- getAndActivate : recursive call, generating for %s"
syncml_logger.info("
--
getAndActivate
:
recursive
call
")
%
(
r
[
i
:
i
+
packet_size
],))
if first_call:
callback_method
(
id_list
=
r
[
i
:
i
+
packet_size
],
min_gid = None
first_call = False
else:
min_gid = r[i]
callback_method(min_gid=min_gid,
max_gid=r[i+packet_size],
message_id=message_id_list.pop(),
message_id=message_id_list.pop(),
activate_kw
=
activate_kw
,
activate_kw=activate_kw)
**
method_kw
)
else:
else:
i = 0
i = 0
for
i
in
xrange
(
0
,
result_count
-
packet_size
,
packet_size
):
if result_count > packet_size:
syncml_logger
.
debug
(
"-- getAndActivate : call, generating for %s : %s"
%
for i in xrange(0, result_count-packet_size, packet_size):
(
r
[
i
:
i
+
packet_size
],
activate_kw
))
syncml_logger.info("
--
getAndActivate
call
")
callback_method
(
id_list
=
r
[
i
:
i
+
packet_size
],
if first_call:
message_id
=
message_id_list
.
pop
(),
min_gid = None
activate_kw
=
activate_kw
,
first_call = False
**
method_kw
)
else:
# Final activity must be executed after all other
min_gid = r[i]
syncml_logger
.
debug
(
"---- getAndActivate : final call for %s : %s"
%
(
r
[
i
+
packet_size
:],
activate_kw
))
callback_method(min_gid=min_gid,
callback_method
(
id_list
=
r
[
i
+
packet_size
:],
# XXX Has to be unit tested
max_gid=r[i+packet_size],
# with mock object
message_id=message_id_list.pop(),
activate_kw=activate_kw)
final_min = i + packet_size
else:
final_min = 0
# Final activity must be tell there is no upper limit
# XXX maybe re-put here the final tag of message to avoid empty message
syncml_logger.info("
----
getAndActivate
:
final
call
")
if first_call:
min_gid = None
else:
min_gid = r[final_min]
callback_method(min_gid=min_gid,
max_gid=None, # No limit when last call
message_id=message_id_list.pop(),
message_id=message_id_list.pop(),
activate_kw
=
activate_kw
,
activate_kw=activate_kw)
**
method_kw
)
return result_count
return result_count
security.declarePrivate('sendMessage')
security.declarePrivate('sendMessage')
...
@@ -207,7 +306,6 @@ class SyncMLSubscription(XMLObject):
...
@@ -207,7 +306,6 @@ class SyncMLSubscription(XMLObject):
sync_id=self.getDestinationReference(),
sync_id=self.getDestinationReference(),
content_type=self.getContentType())
content_type=self.getContentType())
def _loginUser(self, user_id=None):
def _loginUser(self, user_id=None):
"""
"""
Log in with the user provided or defined on self
Log in with the user provided or defined on self
...
@@ -217,7 +315,11 @@ class SyncMLSubscription(XMLObject):
...
@@ -217,7 +315,11 @@ class SyncMLSubscription(XMLObject):
if user_id:
if user_id:
# TODO: make it work for users existing anywhere
# TODO: make it work for users existing anywhere
user_folder = self.getPortalObject().acl_users
user_folder = self.getPortalObject().acl_users
user
=
user_folder
.
getUserById
(
user_id
).
__of__
(
user_folder
)
# __of__ might got AttributeError
try:
user = user_folder.getUserById(user_id).__of__(user_folder) # __of__ might got AttributeError
except AttributeError:
raise ValueError("
User
%
s
cannot
be
found
in
user
folder
,
\
synchronization
cannot
work
with
this
kind
of
user
" % (user_id,))
if user is None:
if user is None:
raise ValueError("
User
%
s
cannot
be
found
in
user
folder
,
\
raise ValueError("
User
%
s
cannot
be
found
in
user
folder
,
\
synchronization
cannot
work
with
this
kind
of
user
" % (user_id,))
synchronization
cannot
work
with
this
kind
of
user
" % (user_id,))
...
@@ -229,13 +331,17 @@ class SyncMLSubscription(XMLObject):
...
@@ -229,13 +331,17 @@ class SyncMLSubscription(XMLObject):
% (self.getRelativeUrl()))
% (self.getRelativeUrl()))
# XXX To be done later
security.declarePrivate('applyActionList')
def
_applyAddCommand
(
self
,
):
def
applyActionList(self, syncml_request, syncml_response, simulate=False
):
"""
"""
Apply the add command received, when document already exits, we
Browse the list of sync command received, apply them and generate answer
do a kind of "Replace" command instead
"""
"""
pass
for action in syncml_request.sync_command_list:
self.applySyncCommand(
action=action,
request_message_id=syncml_request.header["
message_id
"],
syncml_response=syncml_response,
simulate=simulate)
security.declarePrivate('applySyncCommand')
security.declarePrivate('applySyncCommand')
def applySyncCommand(self, action, request_message_id, syncml_response,
def applySyncCommand(self, action, request_message_id, syncml_response,
...
@@ -255,6 +361,7 @@ class SyncMLSubscription(XMLObject):
...
@@ -255,6 +361,7 @@ class SyncMLSubscription(XMLObject):
# First retrieve the GID of the object we want to modify
# First retrieve the GID of the object we want to modify
gid = action["
source
"] or action["
target
"]
gid = action["
source
"] or action["
target
"]
# Retrieve the signature for the current GID
# Retrieve the signature for the current GID
path_list = []
signature = self.getSignatureFromGid(gid)
signature = self.getSignatureFromGid(gid)
if syncml_response is not None: # No response to send when no signature to create
if syncml_response is not None: # No response to send when no signature to create
document = self.getDocumentFromGid(gid)
document = self.getDocumentFromGid(gid)
...
@@ -265,7 +372,7 @@ class SyncMLSubscription(XMLObject):
...
@@ -265,7 +372,7 @@ class SyncMLSubscription(XMLObject):
portal_type='SyncML Signature',
portal_type='SyncML Signature',
id=gid,
id=gid,
)
)
syncml_logger
.
debug
(
"Created a signature for %s - document : %s"
syncml_logger.
info
("
Created
a
signature
for
%
s
-
document
:
%
s
"
% (signature.getPath(), document))
% (signature.getPath(), document))
if document is not None:
if document is not None:
signature.setReference(document.getPath())
signature.setReference(document.getPath())
...
@@ -273,7 +380,7 @@ class SyncMLSubscription(XMLObject):
...
@@ -273,7 +380,7 @@ class SyncMLSubscription(XMLObject):
elif signature.getValidationState() == 'synchronized':
elif signature.getValidationState() == 'synchronized':
# Reset status of signature synchronization
# Reset status of signature synchronization
signature.drift()
signature.drift()
path_list.append(signature.getPath())
force = signature.isForce() # XXX-must check the use of this later
force = signature.isForce() # XXX-must check the use of this later
else:
else:
force = True # Always erease data in this mode
force = True # Always erease data in this mode
...
@@ -291,7 +398,6 @@ class SyncMLSubscription(XMLObject):
...
@@ -291,7 +398,6 @@ class SyncMLSubscription(XMLObject):
if not action['more_data']:
if not action['more_data']:
# This is the last chunk of a partial xml
# This is the last chunk of a partial xml
# or this is just an entire data chunk
# or this is just an entire data chunk
if signature and signature.hasPartialData():
if signature and signature.hasPartialData():
# Build data with already stored data
# Build data with already stored data
signature.appendPartialData(incoming_data)
signature.appendPartialData(incoming_data)
...
@@ -304,7 +410,7 @@ class SyncMLSubscription(XMLObject):
...
@@ -304,7 +410,7 @@ class SyncMLSubscription(XMLObject):
if document is None:
if document is None:
# This is the default behaviour when getting an "
Add
" command
# This is the default behaviour when getting an "
Add
" command
# we create new document from the received data
# we create new document from the received data
syncml_logger
.
debug
(
"Calling addNode with no previous document found"
)
syncml_logger.
info
("
Calling
addNode
with
no
previous
document
found
")
add_data = conduit.addNode(xml=incoming_data,
add_data = conduit.addNode(xml=incoming_data,
object=destination,
object=destination,
signature=signature,
signature=signature,
...
@@ -390,16 +496,22 @@ class SyncMLSubscription(XMLObject):
...
@@ -390,16 +496,22 @@ class SyncMLSubscription(XMLObject):
elif action['command'] == 'Delete':
elif action['command'] == 'Delete':
status_code="
success
"
status_code="
success
"
document = self.getDocumentFromGid(signature.getId())
document = self.getDocumentFromGid(signature.getId())
syncml_logger.info("
Deleting
signature
%
s
&
doc
%
s
" %(signature.getPath(),
document.getPath()))
path_list.remove(signature.getPath())
if document is not None:
if document is not None:
# XXX Can't we get conflict ?
# XXX Can't we get conflict ?
# XXX Review the code to prevent retrieving document
conduit.deleteNode(xml=incoming_data,
conduit.deleteNode(xml=incoming_data,
object=destination,
object=destination,
object_id=document.getId())
object_id=document.getId())
# Delete signature
# Delete signature
self._delObject(gid)
self._delObject(gid)
else:
else:
syncml_logger
.
error
(
"Document with gid is already deleted"
syncml_logger.error("
Document
with
gid
%
s
is
already
deleted
"
% (gid,))
% (gid,))
self.z_delete_data_from_path(path="
%
s
" %(signature.getPath(),))
else:
else:
raise ValueError("
Unknown
command
%
s
" %(action['command'],))
raise ValueError("
Unknown
command
%
s
" %(action['command'],))
...
@@ -432,7 +544,7 @@ class SyncMLSubscription(XMLObject):
...
@@ -432,7 +544,7 @@ class SyncMLSubscription(XMLObject):
message_ref=request_message_id)
message_ref=request_message_id)
else: # We want to retrieve more data
else: # We want to retrieve more data
syncml_logger
.
debug
(
"we need to retrieve more data for %s"
%
(
signature
,))
syncml_logger.
info
("
we
need
to
retrieve
more
data
for
%
s
" % (signature,))
if signature.getValidationState() != 'partial':
if signature.getValidationState() != 'partial':
signature.changeToPartial()
signature.changeToPartial()
signature.appendPartialData(incoming_data)
signature.appendPartialData(incoming_data)
...
@@ -455,46 +567,8 @@ class SyncMLSubscription(XMLObject):
...
@@ -455,46 +567,8 @@ class SyncMLSubscription(XMLObject):
source=self.getSourceReference(),
source=self.getSourceReference(),
last_anchor=self.getLastAnchor(),
last_anchor=self.getLastAnchor(),
next_anchor=self.getNextAnchor())
next_anchor=self.getNextAnchor())
# Index signature with their new value
self.SQLCatalog_indexSyncMLDocumentList(path_list)
security
.
declarePrivate
(
'applyActionList'
)
def
applyActionList
(
self
,
syncml_request
,
syncml_response
,
simulate
=
False
):
"""
Browse the list of sync command received, apply them and generate answer
"""
for
action
in
syncml_request
.
sync_command_list
:
self
.
applySyncCommand
(
action
=
action
,
request_message_id
=
syncml_request
.
header
[
"message_id"
],
syncml_response
=
syncml_response
,
simulate
=
simulate
)
def
_getDeletedData
(
self
,
syncml_response
=
None
):
"""
Add delete command to syncml resposne
"""
# XXX property must be renamed to activity_enabled
if
self
.
getIsActivityEnabled
():
self
.
recurseCallMethod
(
method_id
=
"getId"
,
min_depth
=
1
,
max_depth
=
1
,
activate_kw
=
{
'priority'
:
ACTIVITY_PRIORITY
,
'group_method_id'
:
"%s/checkAndSendDeleteMessage"
%
(
self
.
getRelativeUrl
()),
'tag'
:
"%s_delete"
%
self
.
getRelativeUrl
()})
self
.
activate
(
after_tag
=
"%s_delete"
%
(
self
.
getRelativeUrl
()),
priority
=
ACTIVITY_PRIORITY
+
1
,
).
_sendFinalMessage
()
else
:
# XXX not efficient at all but must not be used (former way)
syncml_logger
.
warning
(
"Using non-efficient way to retrieve delete object on %s"
%
(
self
.
getRelativeUrl
(),))
id_list
=
[
x
.
getId
()
for
x
in
self
.
objectValues
()
if
\
x
.
getValidationState
()
==
"not_synchronized"
]
for
gid
in
id_list
:
syncml_response
.
addDeleteCommand
(
gid
=
gid
)
def _sendFinalMessage(self):
def _sendFinalMessage(self):
"""
"""
...
@@ -516,78 +590,78 @@ class SyncMLSubscription(XMLObject):
...
@@ -516,78 +590,78 @@ class SyncMLSubscription(XMLObject):
'priority' :ACTIVITY_PRIORITY + 1,
'priority' :ACTIVITY_PRIORITY + 1,
'tag' : "
%
s_delete
" %(self.getRelativeUrl(),)
'tag' : "
%
s_delete
" %(self.getRelativeUrl(),)
}
}
syncml_logger
.
warning
(
"Sending final message for modificationson on %s"
syncml_logger.
info
("
Sending
final
message
for
modificationson
on
%
s
"
% (self.getRelativeUrl(),))
% (self.getRelativeUrl(),))
self.activate(**final_activate_kw).sendMessage(xml=str(syncml_response))
self.activate(**final_activate_kw).sendMessage(xml=str(syncml_response))
def
checkAndSendDeleteMessage
(
self
,
message_list
):
def getSearchablePath(self):
"""
return "
%
s
%%
" %(self.getPath().replace('_', '
\
_
'
),)
This is a group method that will be invoked for a message list
It check signature synchronization state to know which one has
def _getSyncMLData(self, syncml_response, min_gid, max_gid):
to be deleted and send the syncml message
"""
syncml_logger
.
warning
(
"Checking deleted signature on %s"
%
(
self
.
getRelativeUrl
(),))
to_delete_id_list
=
[]
for
m
in
message_list
:
if
m
[
0
].
getValidationState
()
==
"not_synchronized"
:
to_delete_id_list
.
append
(
m
[
0
].
getId
())
syncml_logger
.
warning
(
"
\
t
deleted object is %s"
%
(
to_delete_id_list
,))
if
len
(
to_delete_id_list
):
syncml_response
=
SyncMLResponse
()
syncml_response
.
addHeader
(
session_id
=
self
.
getSessionId
(),
message_id
=
self
.
getNextMessageId
(),
target
=
self
.
getUrlString
(),
source
=
self
.
getSubscriptionUrlString
())
syncml_response
.
addBody
()
for
gid
in
to_delete_id_list
:
syncml_response
.
addDeleteCommand
(
gid
=
gid
)
syncml_logger
.
info
(
"%s sendDeleteCommand for %s"
%
(
self
.
getRelativeUrl
(),
to_delete_id_list
))
self
.
activate
(
activity
=
"SQLQueue"
,
tag
=
"%s_delete"
%
(
self
.
getRelativeUrl
(),),
priority
=
ACTIVITY_PRIORITY
).
sendMessage
(
xml
=
str
(
syncml_response
))
def
_getSyncMLData
(
self
,
syncml_response
,
id_list
=
None
):
"""
"""
XXX Comment to be fixed
Compare data from source with data stored in signature from previous
synchronization. If there is any change, add command into the syncml
message
syncml_response : SyncML message to fill with command
min_gid = the lower limit for browsing data
max_gid = the upper limit for browsing data
"""
"""
if
not
id_list
:
syncml_logger.info("
getSyncMLData
,
min
%
s
-
max
%
r" % (min_gid, max_gid,))
syncml_logger
.
warning
(
"Non optimal call to _getSyncMLData, no id list provided : %r"
%
(
id_list
))
else
:
syncml_logger
.
info
(
"getSyncMLData, id list provided %s"
%
(
id_list
,))
conduit
=
self
.
getConduit
()
finished = True
finished = True
conduit = self.getConduit()
if
isinstance
(
conduit
,
basestring
):
# Compare gid list to know which data were deleted
conduit
=
getConduitByName
(
conduit
)
source_gid_list = [x.gid for x in self.z_get_syncml_gid_list(
strict_min_gid=None,
try
:
min_gid=min_gid,
object_list
=
self
.
getDocumentList
(
id_list
=
id_list
)
max_gid=max_gid,
except
TypeError
:
path =self.getSearchableSourcePath(),
# Old style script
limit=None)]
warn
(
"Script %s does not accept id_list paramater"
%
(
self
.
getListMethodId
(),),
DeprecationWarning
)
src = self.z_get_syncml_gid_list(
object_list
=
self
.
getDocumentList
()
src__=1,
strict_min_gid=None,
min_gid=min_gid,
max_gid=max_gid,
path = self.getSearchablePath(),
limit=None)
syncml_logger.info("
source
%
r" % (src,))
signature_list = [x.gid for x in self.z_get_syncml_gid_list(
strict_min_gid=None,
min_gid=min_gid,
max_gid=max_gid,
path = self.getSearchablePath(),
limit=None)]
signature_set = set(signature_list)
source_gid_set = set(source_gid_list) # XXX get it with mysql
deleted_signature_set = signature_set - source_gid_set
syncml_logger.info("
\
t
--->
delete
signature
are
%
r
from
%
r
-
%
r"
% (deleted_signature_set, signature_set, source_gid_set))
for gid in deleted_signature_set:
syncml_response.addDeleteCommand(gid=gid)
loop
=
0
traverse = self.getPortalObject().restrictedTraverse
traverse = self.getPortalObject().restrictedTraverse
object_list = [traverse(x.path) for x in self.z_get_syncml_path_list(
min_gid=min_gid,
max_gid=max_gid,
path=self.getSearchableSourcePath())]
alert_code = self.getSyncmlAlertCode()
alert_code = self.getSyncmlAlertCode()
sync_all = alert_code in ("
refresh_from_client_only
", "
slow_sync
")
sync_all = alert_code in ("
refresh_from_client_only
", "
slow_sync
")
# XXX Quick & dirty hack to prevent signature creation, this must be defined
# XXX Quick & dirty hack to prevent signature creation, this must be defined
# on pub/sub instead
# on pub/sub instead
create_signature = alert_code != "
refresh_from_client_only
"
create_signature = alert_code != "
refresh_from_client_only
"
if
not
len
(
object_list
)
and
id_list
:
if not len(object_list) and
(min_gid or max_gid)
:
syncml_logger
.
warning
(
"No object retrieved althoud id_list (
%s) is provided"
raise ValueError("
No
object
retrieved
althoud
min
/
max
gid
(
%
s
/
%
s
)
is
provided
"
%
(
id_list
))
% (
min_gid, max_gid
))
path_list = []
for result in object_list:
for result in object_list:
object_path = result.getPath()
object_path = result.getPath()
# if loop >= max_range:
# if loop >= max_range:
...
@@ -606,10 +680,14 @@ class SyncMLSubscription(XMLObject):
...
@@ -606,10 +680,14 @@ class SyncMLSubscription(XMLObject):
# no object due to a too small limit
# no object due to a too small limit
signature = self.getSignatureFromGid(gid)
signature = self.getSignatureFromGid(gid)
more_data = False
more_data = False
if signature:
syncml_logger.debug("
signature
is
%
s
=
%
s
" %(signature.getRelativeUrl(),
signature.getValidationState()))
# For the case it was never synchronized, we have to send everything
# For the case it was never synchronized, we have to send everything
if not signature or sync_all:
if not signature or sync_all:
# First time we send this object or the synchronization more required
# Either it is the first time we get this object
# to send every data as it was never synchronized before
# either the synchronization process required
# to send every data again as if it was never done before
document_data = conduit.getXMLFromObjectWithId(
document_data = conduit.getXMLFromObjectWithId(
# XXX To be renamed (getDocumentData) independant from format
# XXX To be renamed (getDocumentData) independant from format
document,
document,
...
@@ -628,7 +706,7 @@ class SyncMLSubscription(XMLObject):
...
@@ -628,7 +706,7 @@ class SyncMLSubscription(XMLObject):
syncml_logger.debug("
Created
a
signature
%
s
for
gid
=
%
s
,
path
%
s
"
syncml_logger.debug("
Created
a
signature
%
s
for
gid
=
%
s
,
path
%
s
"
% (signature.getPath(), gid, document.getPath()))
% (signature.getPath(), gid, document.getPath()))
if len(document_data) > MAX_LEN:
if len(document_data) > MAX_LEN:
syncml_logger
.
debug
(
"data too big, sending multiple message"
)
syncml_logger.
info
("
data
too
big
,
sending
multiple
message
")
more_data = True
more_data = True
finished = False
finished = False
document_data, rest_string = cutXML(document_data, MAX_LEN)
document_data, rest_string = cutXML(document_data, MAX_LEN)
...
@@ -652,7 +730,7 @@ class SyncMLSubscription(XMLObject):
...
@@ -652,7 +730,7 @@ class SyncMLSubscription(XMLObject):
more_data=more_data,
more_data=more_data,
media_type=conduit.getContentType())
media_type=conduit.getContentType())
elif
signature
.
getValidationState
()
in
(
'not_synchronized'
,
elif signature.getValidationState() in ('not_synchronized',
'synchronized',
'conflict_resolved_with_merge'):
'conflict_resolved_with_merge'):
# We don't have synchronized this object yet but it has a signature
# We don't have synchronized this object yet but it has a signature
xml_object = conduit.getXMLFromObjectWithId(document,
xml_object = conduit.getXMLFromObjectWithId(document,
...
@@ -668,7 +746,8 @@ class SyncMLSubscription(XMLObject):
...
@@ -668,7 +746,8 @@ class SyncMLSubscription(XMLObject):
source_ref=signature.getId(),
source_ref=signature.getId(),
sync_code='conflict_resolved_with_merge',
sync_code='conflict_resolved_with_merge',
command='Replace')
command='Replace')
syncml_logger.debug("
\
tMD5
is
%
s
for
%
s
" %((signature.checkMD5(xml_object)),
signature.getReference()))
if not signature.checkMD5(xml_object):
if not signature.checkMD5(xml_object):
# MD5 checksum tell there is a modification of the object
# MD5 checksum tell there is a modification of the object
if conduit.getContentType() != 'text/xml':
if conduit.getContentType() != 'text/xml':
...
@@ -687,15 +766,16 @@ class SyncMLSubscription(XMLObject):
...
@@ -687,15 +766,16 @@ class SyncMLSubscription(XMLObject):
# MD5 Checksum can detect changes like <lang/> != <lang></lang>
# MD5 Checksum can detect changes like <lang/> != <lang></lang>
# but Diff generator will return no diff for it
# but Diff generator will return no diff for it
# in this case, no need to send diff
# in this case, no need to send diff
signature
.
synchronize
()
if signature.getValidationState() != "
synchronized
":
signature.synchronize()
syncml_logger.debug("
signature
%
s
is
synchronized
"
syncml_logger.debug("
signature
%
s
is
synchronized
"
% (signature.getRelativeUrl(),))
% (signature.getRelativeUrl(),))
path_list.append(signature.getPath())
continue
continue
# Split data if necessary
# Split data if necessary
if len(data_diff) > MAX_LEN:
if len(data_diff) > MAX_LEN:
syncml_logger
.
debug
(
"data too big, sending multiple messages"
)
syncml_logger.
info
("
data
too
big
,
sending
multiple
messages
")
more_data = True
more_data = True
finished = False
finished = False
data_diff, rest_string = cutXML(data_diff, MAX_LEN)
data_diff, rest_string = cutXML(data_diff, MAX_LEN)
...
@@ -703,9 +783,8 @@ class SyncMLSubscription(XMLObject):
...
@@ -703,9 +783,8 @@ class SyncMLSubscription(XMLObject):
signature.setPartialAction(REPLACE_ACTION)
signature.setPartialAction(REPLACE_ACTION)
if signature.getValidationState() != 'partial':
if signature.getValidationState() != 'partial':
signature.changeToPartial()
signature.changeToPartial()
syncml_logger
.
debug
(
"signature %s is partial"
syncml_logger.
info
("
signature
%
s
is
partial
"
% (signature.getRelativeUrl(),))
% (signature.getRelativeUrl(),))
else:
else:
# Store the new representation of the document
# Store the new representation of the document
# It will be copy to "
data
" property once synchronization
# It will be copy to "
data
" property once synchronization
...
@@ -715,7 +794,6 @@ class SyncMLSubscription(XMLObject):
...
@@ -715,7 +794,6 @@ class SyncMLSubscription(XMLObject):
syncml_logger.debug("
signature
%
s
is
syncing
"
syncml_logger.debug("
signature
%
s
is
syncing
"
% (signature.getRelativeUrl(),))
% (signature.getRelativeUrl(),))
# Generate the command
# Generate the command
syncml_logger.debug("
will
send
Replace
command
with
%
s
"
syncml_logger.debug("
will
send
Replace
command
with
%
s
"
% (data_diff,))
% (data_diff,))
...
@@ -754,6 +832,7 @@ class SyncMLSubscription(XMLObject):
...
@@ -754,6 +832,7 @@ class SyncMLSubscription(XMLObject):
signature.synchronize()
signature.synchronize()
syncml_logger.debug("
signature
%
s
is
synchronized
"
syncml_logger.debug("
signature
%
s
is
synchronized
"
% (signature.getRelativeUrl(),))
% (signature.getRelativeUrl(),))
elif signature.getValidationState() == 'partial':
elif signature.getValidationState() == 'partial':
# Case of partially sent data
# Case of partially sent data
xml_string = signature.getPartialData()
xml_string = signature.getPartialData()
...
@@ -777,11 +856,14 @@ class SyncMLSubscription(XMLObject):
...
@@ -777,11 +856,14 @@ class SyncMLSubscription(XMLObject):
signature.doSync()
signature.doSync()
syncml_logger.debug("
signature
%
s
is
syncing
"
syncml_logger.debug("
signature
%
s
is
syncing
"
% (signature.getRelativeUrl(),))
% (signature.getRelativeUrl(),))
elif
signature
.
getValidationState
()
in
(
'syncing'
,
'synchronized'
):
elif signature.getValidationState() in ('syncing'):
raise ValueError("
Must
not
get
signature
in
%
s
state
here
,
signature
is
%
s
"
raise ValueError("
Must
not
get
signature
in
%
s
state
here
,
signature
is
%
s
"
% (signature.getValidationState(),
% (signature.getValidationState(),
signature.getPath(),))
signature.getPath(),))
if signature:
path_list.append(signature.getPath())
if not more_data:
if not more_data:
pass
pass
else:
else:
...
@@ -790,8 +872,9 @@ class SyncMLSubscription(XMLObject):
...
@@ -790,8 +872,9 @@ class SyncMLSubscription(XMLObject):
else:
else:
syncml_logger.warning("
Package
is
going
to
be
splitted
")
syncml_logger.warning("
Package
is
going
to
be
splitted
")
break
break
loop
+=
1
syncml_logger
.
debug
(
"_getSyncMLData end with finished %s"
self.SQLCatalog_indexSyncMLDocumentList(path_list)
syncml_logger.info("
_getSyncMLData
end
with
finished
%
s
"
% (finished,))
% (finished,))
return finished
return finished
...
@@ -900,7 +983,10 @@ class SyncMLSubscription(XMLObject):
...
@@ -900,7 +983,10 @@ class SyncMLSubscription(XMLObject):
try:
try:
result_list = query_method(context_document=self, **kw)
result_list = query_method(context_document=self, **kw)
except TypeError:
except TypeError:
result_list
=
query_method
(
**
kw
)
if not RETRO_COMPATIBLE:
raise
else:
result_list = query_method(**kw)
else:
else:
raise KeyError, 'This Subscriber %s provide no list method:%r'
\
raise KeyError, 'This Subscriber %s provide no list method:%r'
\
% (self.getPath(), list_method_id)
% (self.getPath(), list_method_id)
...
@@ -1028,22 +1114,43 @@ class SyncMLSubscription(XMLObject):
...
@@ -1028,22 +1114,43 @@ class SyncMLSubscription(XMLObject):
conflict_list.extend(signature.getConflictList())
conflict_list.extend(signature.getConflictList())
return conflict_list
return conflict_list
security.declareProtected(Permissions.ModifyPortalContent,
security.declareProtected(Permissions.ModifyPortalContent,
'in
itialiseSynchronization
'
)
'in
dexSourceData
')
def
in
itialiseSynchronization
(
self
):
def in
dexSourceData(self, client=False
):
"""
"""
Set the status of every signature as not_synchronized
Index source data into mysql for ensemble comparison
This depends on synchronization type
"""
"""
if
self
.
getIsActivityEnabled
():
if (client and self.getSyncmlAlertCode() not in
\
self
.
getAndActivateResetSignature
()
("
one_way_from_server
", "
refresh_from_server_only
")) or
\
else
:
(not client and self.getSyncmlAlertCode() not in
\
for
signature
in
self
.
contentValues
(
portal_type
=
'SyncML Signature'
):
("
one_way_from_client
", "
refresh_from_client_only
")):
# Change the status only if we are not in a conflict mode
if
signature
.
getValidationState
()
not
in
(
portal = self.getPortalObject()
'conflict'
,
pref = portal.portal_preferences
'conflict_resolved_with_merge'
,
# First we must unindex everything
'conflict_resolved_with_client_command_winning'
):
portal.z_unindex_syncml_data(path=self.getSearchableSourcePath())
signature
.
reset
()
if self.getIsActivityEnabled():
activate_kw = {
'activity' : 'SQLQueue',
'tag' : self.getRelativeUrl(),
'priority' :ACTIVITY_PRIORITY
}
self.getAndIndex(
callback="
SQLCatalog_indexSyncMLDocumentList
",
method_kw={'subscription_path' : self.getRelativeUrl()},
activate_kw=activate_kw,
packet_size=pref.getPreferredDocumentRetrievedPerActivityCount(),
activity_count=pref.getPreferredRetrievalActivityCount(),
)
else:
r = [x.getPath() for x in self.getDocumentList()]
syncml_logger.info("
indexing
data
from
%
s
:
%
r" %(self.getPath(), r))
portal.SQLCatalog_indexSyncMLDocumentList(
path_list=r[:],
subscription_path=self.getRelativeUrl())
security.declareProtected(Permissions.ModifyPortalContent,
security.declareProtected(Permissions.ModifyPortalContent,
'getAndActivateResetSignature')
'getAndActivateResetSignature')
...
...
product/ERP5SyncML/Engine/AsynchronousEngine.py
View file @
2d2c38f9
...
@@ -78,7 +78,10 @@ class SyncMLAsynchronousEngine(EngineMixin):
...
@@ -78,7 +78,10 @@ class SyncMLAsynchronousEngine(EngineMixin):
syncml_response
=
self
.
_generateBaseResponse
(
subscription
)
syncml_response
=
self
.
_generateBaseResponse
(
subscription
)
syncml_response
.
addFinal
()
syncml_response
.
addFinal
()
else
:
else
:
self
.
runGetAndActivate
(
subscription
=
subscription
,
tag
=
tag
)
# Make sure it is launched after indexation step
self
.
runGetAndActivate
(
subscription
=
subscription
,
tag
=
tag
,
after_method_id
=
(
"getAndIndex"
,
"SQLCatalog_indexSyncMLSignatureList"
))
syncml_logger
.
info
(
"X-> Client is sendind modification in activities"
)
syncml_logger
.
info
(
"X-> Client is sendind modification in activities"
)
# As we generated all activities to send data at once, process must not
# As we generated all activities to send data at once, process must not
# go back here, go into processing state thus status will be applied and
# go back here, go into processing state thus status will be applied and
...
@@ -163,10 +166,10 @@ class SyncMLAsynchronousEngine(EngineMixin):
...
@@ -163,10 +166,10 @@ class SyncMLAsynchronousEngine(EngineMixin):
# Apply command & send modifications
# Apply command & send modifications
# Apply status about object send & synchronized if any
# Apply status about object send & synchronized if any
s
ync_status_counter
=
s
elf
.
_readStatusList
(
syncml_request
,
subscriber
,
self
.
_readStatusList
(
syncml_request
,
subscriber
,
generate_alert
=
True
)
generate_alert
=
True
)
syncml_response
=
None
syncml_response
=
None
tag
=
subscri
ption_path
=
subscri
ber
.
getRelativeUrl
()
tag
=
subscriber
.
getRelativeUrl
()
after_method_id
=
None
after_method_id
=
None
if
subscriber
.
getSynchronizationState
()
==
"sending_modifications"
:
if
subscriber
.
getSynchronizationState
()
==
"sending_modifications"
:
if
syncml_request
.
isFinal
:
if
syncml_request
.
isFinal
:
...
@@ -202,15 +205,13 @@ class SyncMLAsynchronousEngine(EngineMixin):
...
@@ -202,15 +205,13 @@ class SyncMLAsynchronousEngine(EngineMixin):
if
syncml_request
.
isFinal
:
if
syncml_request
.
isFinal
:
# Server then sends its modifications
# Server then sends its modifications
subscriber
.
sendModifications
()
subscriber
.
sendModifications
()
# Now that everything is ok, init sync information
# Run indexation only once client have sent its modifications
if
subscriber
.
getSyncmlAlertCode
()
not
in
(
"one_way_from_client"
,
subscriber
.
indexSourceData
()
"refresh_from_client_only"
):
# Reset signature only if we have to check modifications on server side
subscriber
.
initialiseSynchronization
()
# Start to send modification only once we have processed
# Start to send modification only once we have processed
# all message from client
# all message from client
after_method_id
=
'processServerSynchronization'
,
after_method_id
=
(
'processServerSynchronization'
,
'SQLCatalog_indexSyncMLDocumentList'
)
# XXX after tag might also be required to make sure all data are indexed
tag
=
(
tag
,
"%s_reset"
%
subscriber
.
getPath
(),)
tag
=
(
tag
,
"%s_reset"
%
subscriber
.
getPath
(),)
# Do not continue in elif, as sending modifications is done in the same
# Do not continue in elif, as sending modifications is done in the same
# package as sending notifications
# package as sending notifications
...
@@ -242,10 +243,9 @@ class SyncMLAsynchronousEngine(EngineMixin):
...
@@ -242,10 +243,9 @@ class SyncMLAsynchronousEngine(EngineMixin):
after_tag
=
tag
).
sendMessage
(
after_tag
=
tag
).
sendMessage
(
xml
=
str
(
syncml_response
))
xml
=
str
(
syncml_response
))
def
runGetAndActivate
(
self
,
subscription
,
tag
,
after_method_id
=
None
):
def
runGetAndActivate
(
self
,
subscription
,
tag
,
after_method_id
=
None
):
"""
"""
Generate tag and method parameter and call the getAndActivate method
Launch the browsing of GID that will call the generation of syncml commands
"""
"""
activate_kw
=
{
activate_kw
=
{
'activity'
:
'SQLQueue'
,
'activity'
:
'SQLQueue'
,
...
@@ -253,20 +253,16 @@ class SyncMLAsynchronousEngine(EngineMixin):
...
@@ -253,20 +253,16 @@ class SyncMLAsynchronousEngine(EngineMixin):
'tag'
:
tag
,
'tag'
:
tag
,
'priority'
:
ACTIVITY_PRIORITY
'priority'
:
ACTIVITY_PRIORITY
}
}
method_kw
=
{
'subscription_path'
:
subscription
.
getRelativeUrl
(),
}
pref
=
getSite
().
portal_preferences
pref
=
getSite
().
portal_preferences
subscription
.
getAndActivate
(
subscription
.
getAndActivate
(
callback
=
"sendSyncCommand"
,
callback
=
"sendSyncCommand"
,
method_kw
=
method_kw
,
activate_kw
=
activate_kw
,
activate_kw
=
activate_kw
,
packet_size
=
pref
.
getPreferredDocumentRetrievedPerActivityCount
(),
packet_size
=
pref
.
getPreferredDocumentRetrievedPerActivityCount
(),
activity_count
=
pref
.
getPreferredRetrievalActivityCount
(),
activity_count
=
pref
.
getPreferredRetrievalActivityCount
(),
)
)
#
Then get deleted documen
t
#
then send the final message of this sync par
t
# this will send also the final message of this sync part
subscription
.
activate
(
after_tag
=
tag
,
subscription
.
activate
(
after_tag
=
tag
).
_getDeletedData
()
priority
=
ACTIVITY_PRIORITY
+
1
).
_sendFinalMessage
()
return
True
return
True
...
...
product/ERP5SyncML/Engine/EngineMixin.py
View file @
2d2c38f9
...
@@ -145,9 +145,10 @@ class EngineMixin(object):
...
@@ -145,9 +145,10 @@ class EngineMixin(object):
signature
=
domain
.
getSignatureFromGid
(
object_gid
)
signature
=
domain
.
getSignatureFromGid
(
object_gid
)
if
status
[
'status_code'
]
==
resolveSyncmlStatusCode
(
'success'
):
if
status
[
'status_code'
]
==
resolveSyncmlStatusCode
(
'success'
):
if
signature
:
if
signature
:
domain
.
z_delete_data_from_path
(
path
=
signature
.
getPath
())
domain
.
_delObject
(
signature
.
getId
())
domain
.
_delObject
(
signature
.
getId
())
else
:
else
:
raise
ValueError
(
"Found no signature to delete
"
)
raise
ValueError
(
"Found no signature to delete
for gid %s"
%
(
object_gid
,)
)
else
:
else
:
raise
ValueError
(
"Unknown status code : %r"
%
(
status
[
'status_code'
],))
raise
ValueError
(
"Unknown status code : %r"
%
(
status
[
'status_code'
],))
syncml_logger
.
error
(
"
\
t
Object deleted %s"
%
syncml_logger
.
error
(
"
\
t
Object deleted %s"
%
...
@@ -191,10 +192,8 @@ class EngineMixin(object):
...
@@ -191,10 +192,8 @@ class EngineMixin(object):
if
subscription
.
getAuthenticationState
()
!=
'logged_in'
:
if
subscription
.
getAuthenticationState
()
!=
'logged_in'
:
# Workflow action
# Workflow action
subscription
.
login
()
subscription
.
login
()
if
subscription
.
getSyncmlAlertCode
()
not
in
(
"one_way_from_server"
,
"refresh_from_server_only"
):
subscription
.
indexSourceData
(
client
=
True
)
# Reset signature only if client send its modification to server
subscription
.
initialiseSynchronization
()
# Create the package 1
# Create the package 1
syncml_response
=
SyncMLResponse
()
syncml_response
=
SyncMLResponse
()
...
@@ -301,7 +300,9 @@ class EngineMixin(object):
...
@@ -301,7 +300,9 @@ class EngineMixin(object):
'one_way_from_server'
,
'one_way_from_server'
,
'refresh_from_client_only'
,
'refresh_from_client_only'
,
'one_way_from_client'
):
'one_way_from_client'
):
# XXX Why re-editing here ?
# Make sure we update configuration based on publication data
# so that manual edition is propagated
# XXX Must check all properties that must be setted
subscriber
.
setXmlBindingGeneratorMethodId
(
subscriber
.
setXmlBindingGeneratorMethodId
(
publication
.
getXmlBindingGeneratorMethodId
())
publication
.
getXmlBindingGeneratorMethodId
())
subscriber
.
setConduitModuleId
(
publication
.
getConduitModuleId
())
subscriber
.
setConduitModuleId
(
publication
.
getConduitModuleId
())
...
...
product/ERP5SyncML/Engine/SynchronousEngine.py
View file @
2d2c38f9
...
@@ -29,6 +29,7 @@ from logging import getLogger
...
@@ -29,6 +29,7 @@ from logging import getLogger
from
Products.ERP5SyncML.Engine.EngineMixin
import
EngineMixin
from
Products.ERP5SyncML.Engine.EngineMixin
import
EngineMixin
from
Products.ERP5SyncML.SyncMLConstant
import
SynchronizationError
from
Products.ERP5SyncML.SyncMLConstant
import
SynchronizationError
from
Products.ERP5.ERP5Site
import
getSite
syncml_logger
=
getLogger
(
'ERP5SyncML'
)
syncml_logger
=
getLogger
(
'ERP5SyncML'
)
...
@@ -81,13 +82,12 @@ class SyncMLSynchronousEngine(EngineMixin):
...
@@ -81,13 +82,12 @@ class SyncMLSynchronousEngine(EngineMixin):
# We only get data from server
# We only get data from server
finished
=
True
finished
=
True
else
:
else
:
finished
=
subscription
.
_getSyncMLData
(
finished
=
subscription
.
_getSyncMLData
(
syncml_response
=
syncml_response
,
syncml_response
=
syncml_response
,
min_gid
=
None
,
max_gid
=
None
)
)
syncml_logger
.
info
(
"-> Client sendind modification, finished %s"
%
(
finished
,))
syncml_logger
.
info
(
"-> Client sendind modification, finished %s"
%
(
finished
,))
if
finished
:
if
finished
:
# Add deleted objets
# Add deleted objets
subscription
.
_getDeletedData
(
syncml_response
=
syncml_response
)
#
subscription._getDeletedData(syncml_response=syncml_response)
# Notify that all modifications were sent
# Notify that all modifications were sent
syncml_response
.
addFinal
()
syncml_response
.
addFinal
()
# Will then start processing sync commands from server
# Will then start processing sync commands from server
...
@@ -191,10 +191,8 @@ class SyncMLSynchronousEngine(EngineMixin):
...
@@ -191,10 +191,8 @@ class SyncMLSynchronousEngine(EngineMixin):
if
syncml_request
.
isFinal
:
if
syncml_request
.
isFinal
:
# Server will now send its modifications
# Server will now send its modifications
subscriber
.
sendModifications
()
subscriber
.
sendModifications
()
if
subscriber
.
getSyncmlAlertCode
()
not
in
(
"one_way_from_client"
,
# Run indexation only once client has sent its modifications
"refresh_from_client_only"
):
subscriber
.
indexSourceData
()
# Reset signature only if we have to check modifications on server side
subscriber
.
initialiseSynchronization
()
# Do not continue in elif, as sending modifications is done in the same
# Do not continue in elif, as sending modifications is done in the same
# package as sending notifications
# package as sending notifications
...
@@ -205,11 +203,11 @@ class SyncMLSynchronousEngine(EngineMixin):
...
@@ -205,11 +203,11 @@ class SyncMLSynchronousEngine(EngineMixin):
# We only get data from client
# We only get data from client
finished
=
True
finished
=
True
else
:
else
:
finished
=
subscriber
.
_getSyncMLData
(
finished
=
subscriber
.
_getSyncMLData
(
syncml_response
=
syncml_response
,
syncml_response
=
syncml_respons
e
)
min_gid
=
None
,
max_gid
=
Non
e
)
syncml_logger
.
info
(
"-> Server sendind data, finished %s"
%
(
finished
,))
syncml_logger
.
info
(
"-> Server sendind data, finished %s"
%
(
finished
,))
if
finished
:
if
finished
:
subscriber
.
_getDeletedData
(
syncml_response
=
syncml_response
)
#
subscriber._getDeletedData(syncml_response=syncml_response)
syncml_response
.
addFinal
()
syncml_response
.
addFinal
()
subscriber
.
waitNotifications
()
subscriber
.
waitNotifications
()
# Do not go into finished here as we must wait for
# Do not go into finished here as we must wait for
...
...
product/ERP5SyncML/Tool/SynchronizationTool.py
View file @
2d2c38f9
...
@@ -399,13 +399,14 @@ class SynchronizationTool(BaseTool):
...
@@ -399,13 +399,14 @@ class SynchronizationTool(BaseTool):
return
str
(
syncml_response
)
return
str
(
syncml_response
)
# As engines are not zodb objects, the tool acts as a placeholder for methods
# that need to be called in activities
def
applySyncCommand
(
self
,
subscription_path
,
response_message_id
,
def
applySyncCommand
(
self
,
subscription_path
,
response_message_id
,
activate_kw
,
**
kw
):
activate_kw
,
**
kw
):
"""
"""
This methods is intented to be called by asynchronous engine in activity to
This methods is intented to be called by asynchronous engine in activity to
apply sync commands for a subset of data
apply sync commands for a subset of data
As engines are not zodb object, the tool acts as a placeholder for method
that need to be called in activities
"""
"""
subscription
=
self
.
restrictedTraverse
(
subscription_path
)
subscription
=
self
.
restrictedTraverse
(
subscription_path
)
assert
subscription
is
not
None
,
"Impossible to find subscription %s"
\
assert
subscription
is
not
None
,
"Impossible to find subscription %s"
\
...
@@ -437,13 +438,11 @@ class SynchronizationTool(BaseTool):
...
@@ -437,13 +438,11 @@ class SynchronizationTool(BaseTool):
def
sendSyncCommand
(
self
,
id_list
,
message_id
,
subscription_path
,
def
sendSyncCommand
(
self
,
g
id_list
,
message_id
,
subscription_path
,
activate_kw
,
is_final_message
=
False
):
activate_kw
,
first_call
=
False
,
last_call
=
False
):
"""
"""
This methods is intented to be called by asynchronous engine in activity to
This methods is intented to be called by asynchronous engine in activity to
send sync commands for a subset of data
send sync commands for a subset of data
As engines are not zodb object, the tool acts as a placeholder for method
that need to be called in activities
"""
"""
subscription
=
self
.
restrictedTraverse
(
subscription_path
)
subscription
=
self
.
restrictedTraverse
(
subscription_path
)
assert
subscription
is
not
None
,
"Impossible to find subscription %s"
\
assert
subscription
is
not
None
,
"Impossible to find subscription %s"
\
...
@@ -457,17 +456,14 @@ class SynchronizationTool(BaseTool):
...
@@ -457,17 +456,14 @@ class SynchronizationTool(BaseTool):
source
=
subscription
.
getSubscriptionUrlString
())
source
=
subscription
.
getSubscriptionUrlString
())
syncml_response
.
addBody
()
syncml_response
.
addBody
()
subscription
.
_getSyncMLData
(
subscription
.
_getSyncMLData
(
syncml_response
=
syncml_response
,
syncml_response
=
syncml_response
,
id_list
=
id_list
,
gid_list
=
gid_list
,
first_call
=
first_call
,
last_call
=
last_call
,
)
)
if
is_final_message
:
# Send the message in activity to prevent recomputation of data in case of
# Notify that all modifications were sent
syncml_response
.
addFinal
()
# Send the message in activity to prevent recomputing data in case of
# transport failure
# transport failure
# activate_kw["group_method_id"] = None
# activate_kw["group_method_id"] = None
# activate_kw["group_method_cost"] = .05
# activate_kw["group_method_cost"] = .05
...
...
product/ERP5SyncML/tests/testERP5SyncML.py
View file @
2d2c38f9
...
@@ -44,6 +44,7 @@ from Products.ERP5SyncML.Document import SyncMLSubscription
...
@@ -44,6 +44,7 @@ from Products.ERP5SyncML.Document import SyncMLSubscription
from
Products.ERP5SyncML.tests.testERP5SyncMLMixin
import
TestERP5SyncMLMixin
\
from
Products.ERP5SyncML.tests.testERP5SyncMLMixin
import
TestERP5SyncMLMixin
\
as
TestMixin
as
TestMixin
from
Products.ERP5Type.tests.backportUnittest
import
expectedFailure
from
Products.ERP5Type.tests.backportUnittest
import
expectedFailure
from
_mysql_exceptions
import
OperationalError
class
TestERP5SyncMLMixin
(
TestMixin
):
class
TestERP5SyncMLMixin
(
TestMixin
):
...
@@ -98,6 +99,8 @@ class TestERP5SyncMLMixin(TestMixin):
...
@@ -98,6 +99,8 @@ class TestERP5SyncMLMixin(TestMixin):
def
afterSetUp
(
self
):
def
afterSetUp
(
self
):
"""Setup."""
"""Setup."""
self
.
login
()
self
.
login
()
self
.
portal
.
z_drop_syncml
()
self
.
portal
.
z_create_syncml
()
# This test creates Person inside Person, so we modifiy type information to
# This test creates Person inside Person, so we modifiy type information to
# allow anything inside Person (we'll cleanup on teardown)
# allow anything inside Person (we'll cleanup on teardown)
self
.
getTypesTool
().
getTypeInfo
(
'Person'
).
filter_content_types
=
0
self
.
getTypesTool
().
getTypeInfo
(
'Person'
).
filter_content_types
=
0
...
@@ -228,6 +231,7 @@ class TestERP5SyncMLMixin(TestMixin):
...
@@ -228,6 +231,7 @@ class TestERP5SyncMLMixin(TestMixin):
result
=
portal_sync
.
processClientSynchronization
(
subscription
.
getPath
())
result
=
portal_sync
.
processClientSynchronization
(
subscription
.
getPath
())
self
.
tic
()
self
.
tic
()
nb_message
+=
1
nb_message
+=
1
self
.
tic
()
return
nb_message
return
nb_message
def
synchronizeWithBrokenMessage
(
self
,
id
):
def
synchronizeWithBrokenMessage
(
self
,
id
):
...
@@ -948,6 +952,8 @@ return [context[%r]]
...
@@ -948,6 +952,8 @@ return [context[%r]]
person_server
.
manage_delObjects
(
self
.
id1
)
person_server
.
manage_delObjects
(
self
.
id1
)
person_client1
=
self
.
getPersonClient1
()
person_client1
=
self
.
getPersonClient1
()
person_client1
.
manage_delObjects
(
self
.
id2
)
person_client1
.
manage_delObjects
(
self
.
id2
)
# import ipdb
# ipdb.set_trace()
self
.
synchronize
(
self
.
sub_id1
)
self
.
synchronize
(
self
.
sub_id1
)
self
.
synchronize
(
self
.
sub_id2
)
self
.
synchronize
(
self
.
sub_id2
)
self
.
checkSynchronizationStateIsSynchronized
()
self
.
checkSynchronizationStateIsSynchronized
()
...
@@ -1543,7 +1549,7 @@ return [context[%r]]
...
@@ -1543,7 +1549,7 @@ return [context[%r]]
self
.
assertEquals
(
client_person
.
getLastName
(),
self
.
last_name1
)
self
.
assertEquals
(
client_person
.
getLastName
(),
self
.
last_name1
)
# reset for refresh sync
# reset for refresh sync
# after synchroniz
e, the client object retrieve value of
server
# after synchroniz
ation, the client retrieves value from
server
self
.
resetSignaturePublicationAndSubscription
()
self
.
resetSignaturePublicationAndSubscription
()
self
.
synchronize
(
self
.
sub_id1
)
self
.
synchronize
(
self
.
sub_id1
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment