DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sync-ops changes

Browse Source
This commit is contained in:
Victor Dubiniuk 2013-08-07 00:08:43 +03:00 committed by Tobias Hintze
parent 1711c9663d
commit 023bf0117d
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ajax/otpoll.php
View File

@ -70,24 +70,14 @@ try{
$currentHead = OCA\Office\Op::getHeadSeq($esId); $currentHead = OCA\Office\Op::getHeadSeq($esId);
if (is_null($seqHead) && is_null($currentHead)) { // very first ops if (!$currentHead || $seqHead == $currentHead) { // very first ops || match the current head
// Add incoming ops, response with a new head
foreach ($ops as $op) { foreach ($ops as $op) {
$op['opspec'] = json_encode($op['opspec']); $op['opspec'] = json_encode($op['opspec']);
$lastSeq = OCA\Office\Op::add($op); $lastSeq = OCA\Office\Op::add($op);
} }
$response["result"] = 'added'; $response["result"] = 'added';
$response["headSeq"] = $lastSeq + 1; $response["headSeq"] = $lastSeq;
} else if ($seqHead === $currentHead) { // no conflict
foreach ($ops as $op){
$op['opspec'] = json_encode($op['opspec']);
try{
OCA\Office\Op::add($op);
} catch (Exception $e){
}
}
$response["result"] = 'added';
$response["headSeq"] = $lastSeq + 1;
} else { } else {
// result: 'conflict', // result: 'conflict',
// ops: a list of all ops since $postobject['args']['seq_head'] // ops: a list of all ops since $postobject['args']['seq_head']