R29149 - in /trunk/phpgwapi/inc/horde/Horde/SyncML: Command/ Sync/

Old eGW-svn
1

Author: jlehrke
New Revision: 29149

URL: http://www.egroupware.org/viewvc/egroupware?rev=29149&view=rev
Log:
address moreData conflict between datastores

Modified:
trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php
trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/RefreshFromServerSync.php
trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php
trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php

Modified: trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php?rev=29149&r1=29148&r2=29149&view=diff

— trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php (original)
+++ trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Alert.php Tue Feb 9 11:44:15 2010
@@ -285,8 +285,10 @@
$synctype != ALERT_ONE_WAY_FROM_CLIENT &&
$synctype != ALERT_ONE_WAY_FROM_SERVER) {
$serverAnchorLast = 0;

  •        if (!$anchormatch) {

  •            // Erase existing map:

  •        if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['slowsync_ignore_map']) &&

  •        	$GLOBALS['egw_info']['user']['preferences']['syncml']['slowsync_ignore_map']

  •        	|| !$anchormatch) {

  •            // Erase existing map
           $state->removeAllUID($this->_targetLocURI);
       }
   }

Modified: trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/RefreshFromServerSync.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/RefreshFromServerSync.php?rev=29149&r1=29148&r2=29149&view=diff

— trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/RefreshFromServerSync.php (original)
+++ trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/RefreshFromServerSync.php Tue Feb 9 11:44:15 2010
@@ -39,6 +39,13 @@
if (isset($state->curSyncItem)) {
// Finish the pending sync item
$cmd = &$state->curSyncItem;

  •   	if (!is_a($cmd, 'Horde_SyncML_Command_Sync_ContentSyncElement')) {

  •   		// Conflict with other datastore

  •   		Horde :: logMessage("SyncML: handleSync($currentCmdID, $hordeType, $syncType) moreData conflict found",

  •   				__FILE__, __LINE__, PEAR_LOG_DEBUG);

  •   		$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);

  •   		return $currentCmdID;

  •   	}
  	unset($state->curSyncItem);
  	$currentCmdID = $cmd->outputCommand($currentCmdID, $output, 'Sync');

Modified: trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php?rev=29149&r1=29148&r2=29149&view=diff

— trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php (original)
+++ trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php Tue Feb 9 11:44:15 2010
@@ -47,6 +47,13 @@
if (isset($state->curSyncItem)) {
// Finish the pending sync item
$cmd = &$state->curSyncItem;

  •   	if (!is_a($cmd, 'Horde_SyncML_Command_Sync_ContentSyncElement')) {

  •   		// Conflict with other datastore

  •   		Horde :: logMessage("SyncML: handleSync($currentCmdID, $hordeType, $syncType) moreData conflict found",

  •   				__FILE__, __LINE__, PEAR_LOG_DEBUG);

  •   		$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);

  •   		return $currentCmdID;

  •   	}
  	unset($state->curSyncItem);
  	$currentCmdID = $cmd->outputCommand($currentCmdID, $output, 'Sync');

Modified: trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php?rev=29149&r1=29148&r2=29149&view=diff

— trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php (original)
+++ trunk/phpgwapi/inc/horde/Horde/SyncML/Sync/TwoWaySync.php Tue Feb 9 11:44:15 2010
@@ -62,6 +62,13 @@
if (isset ($state->curSyncItem)) {
// Finish the pending sync item
$cmd = & $state->curSyncItem;

  •   	if (!is_a($cmd, 'Horde_SyncML_Command_Sync_ContentSyncElement')) {

  •   		// Conflict with other datastore

  •   		Horde :: logMessage("SyncML: handleSync($currentCmdID, $hordeType, $syncType) moreData conflict found",

  •   				__FILE__, __LINE__, PEAR_LOG_DEBUG);

  •   		$state->setSyncStatus(SERVER_SYNC_DATA_PENDING);

  •   		return $currentCmdID;

  •   	}
  	unset ($state->curSyncItem);
  	$currentCmdID = $cmd->outputCommand($currentCmdID, $output, 'Sync');

The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs