Well, it seems webdav-sync needs to change to always report delete.

This will become part of the spec in the next revision.
This commit is contained in:
Andrew McMillan 2010-02-03 10:40:05 -08:00
parent 0b9cdd593b
commit 5384d175e9

View File

@ -72,12 +72,6 @@ if ( $qry->Exec("REPORT",__LINE__,__FILE__) ) {
if ( $object->dav_name == $last_dav_name ) { if ( $object->dav_name == $last_dav_name ) {
/** The complex case: this is the second or subsequent for this dav_id */ /** The complex case: this is the second or subsequent for this dav_id */
if ( $object->sync_status == 404 ) { if ( $object->sync_status == 404 ) {
if ( $first_status == 201 ) {
array_pop($responses);
$last_dav_name = '';
$first_status = 0;
}
else {
array_pop($responses); array_pop($responses);
$resultset = array( $resultset = array(
new XMLElement( 'href', ConstructURL($object->dav_name) ), new XMLElement( 'href', ConstructURL($object->dav_name) ),
@ -86,7 +80,6 @@ if ( $qry->Exec("REPORT",__LINE__,__FILE__) ) {
$responses[] = new XMLElement( 'sync-response', $resultset ); $responses[] = new XMLElement( 'sync-response', $resultset );
$first_status = 404; $first_status = 404;
} }
}
else if ( $object->sync_status == 201 && $first_status == 404 ) { else if ( $object->sync_status == 201 && $first_status == 404 ) {
// ... Delete ... Create ... is indicated as a create, but don't forget we started with a delete // ... Delete ... Create ... is indicated as a create, but don't forget we started with a delete
array_pop($responses); array_pop($responses);