From 34a27d126d49619c2e662f860866b91c89a02776 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Mon, 27 Dec 2010 18:23:13 +1300 Subject: [PATCH] Refactor PUT functions to set modified/created dates more correctly. Signed-off-by: Andrew McMillan --- inc/caldav-PUT-functions.php | 90 +++++++++++-------- testing/tests/binding/1035-GET-mashup.result | 9 +- .../0010-Mulberry-PUT-1.result | 2 +- .../regression-suite/0010-Mulberry-PUT-1.test | 5 +- .../0011-Mulberry-PUT-1b.result | 8 +- .../0011-Mulberry-PUT-1b.test | 4 +- .../0020-Mulberry-DELETE-1.result | 2 +- .../0021-Mulberry-DELETE-2.test | 2 +- .../0310-Chandler-PUT-1.result | 57 +++++++++++- .../0311-Chandler-PUT-2.result | 40 ++++++++- .../0503-iCal-PROPFIND.result | 4 +- .../0504-iCal-PROPFIND.result | 6 +- .../regression-suite/0505-iCal-PUT.result | 2 +- .../tests/regression-suite/0505-iCal-PUT.test | 2 +- .../regression-suite/0506-iCal-PUT.result | 8 +- .../tests/regression-suite/0506-iCal-PUT.test | 6 +- .../regression-suite/0508-iCal-REPORT.result | 6 +- .../regression-suite/0512-iCal-PUT.result | 2 +- .../tests/regression-suite/0512-iCal-PUT.test | 3 +- .../regression-suite/0513-iCal-PUT.result | 10 +-- .../tests/regression-suite/0513-iCal-PUT.test | 9 +- .../0514-iCal-PUT-VTODO.result | 2 +- .../regression-suite/0514-iCal-PUT-VTODO.test | 3 +- .../0515-iCal-PUT-VEVENT.result | 2 +- .../0515-iCal-PUT-VEVENT.test | 3 +- .../0532-iCal4-PROPFIND.result | 4 +- .../0536-iCal4-PROPFIND.result | 8 +- .../0550-iPhone-REPORT.result | 8 +- .../0551-iPhone-REPORT.result | 42 ++++----- .../0555-iPhone-REPORT.result | 4 +- .../0598-REPORT-sync-initial.result | 8 +- .../0599-REPORT-sync-changed.result | 8 +- .../regression-suite/0701-caldav4j-PUT.result | 2 +- .../regression-suite/0701-caldav4j-PUT.test | 3 +- .../regression-suite/0702-caldav4j-PUT.result | 2 +- .../regression-suite/0702-caldav4j-PUT.test | 6 +- .../regression-suite/0817-Spec-PUT.result | 2 +- .../tests/regression-suite/0817-Spec-PUT.test | 6 +- .../regression-suite/0818-Spec-PUT.result | 15 ++-- .../tests/regression-suite/0818-Spec-PUT.test | 9 +- .../0822-Spec-PROPFIND-3.result | 52 +++++------ .../0822-Spec-PROPFIND-3.test | 2 +- .../0823-Spec-PROPFIND-4.result | 4 +- .../0825-Spec-PROPFIND-6.result | 4 +- .../0889-POST-freebusy.result | 24 +++++ .../regression-suite/0900-Moz-REPORT.result | 34 +++---- .../0901-GET-Collection.result | 11 ++- .../tests/regression-suite/0924-MOVE-a.result | 1 - .../tests/regression-suite/0924-MOVE-a.test | 1 - .../tests/regression-suite/0924-MOVE.result | 1 - testing/tests/regression-suite/0924-MOVE.test | 1 - .../tests/regression-suite/0925-MOVE.result | 1 - testing/tests/regression-suite/0925-MOVE.test | 1 - .../tests/regression-suite/0926-MOVE.result | 1 - testing/tests/regression-suite/0926-MOVE.test | 1 - .../tests/regression-suite/0927-MOVE.result | 1 - testing/tests/regression-suite/0927-MOVE.test | 1 - 57 files changed, 344 insertions(+), 211 deletions(-) diff --git a/inc/caldav-PUT-functions.php b/inc/caldav-PUT-functions.php index a044d4a8..feed7c04 100644 --- a/inc/caldav-PUT-functions.php +++ b/inc/caldav-PUT-functions.php @@ -753,42 +753,34 @@ function write_resource( $user_no, $path, $caldav_data, $collection_id, $author, $qry = new AwlQuery(); $qry->Begin(); - $params = array( - ':dav_name' => $path, - ':user_no' => $user_no, + + $dav_params = array( ':etag' => $etag, ':dav_data' => $caldav_data, ':caldav_type' => $resource_type, ':session_user' => $author, ':weak_etag' => $weak_etag ); + + $calitem_params = array( + ':etag' => $etag + ); + if ( $put_action_type == 'INSERT' ) { - create_scheduling_requests($vcal); - $sql = 'INSERT INTO caldav_data ( user_no, dav_name, dav_etag, caldav_data, caldav_type, logged_user, created, modified, collection_id, weak_etag ) - VALUES( :user_no, :dav_name, :etag, :dav_data, :caldav_type, :session_user, current_timestamp, current_timestamp, :collection_id, :weak_etag )'; - $params[':collection_id'] = $collection_id; + $qry->QDo('SELECT nextval(\'dav_id_seq\') AS dav_id'); } else { - update_scheduling_requests($vcal); - $sql = 'UPDATE caldav_data SET caldav_data=:dav_data, dav_etag=:etag, caldav_type=:caldav_type, logged_user=:session_user, - modified=current_timestamp, weak_etag=:weak_etag WHERE user_no=:user_no AND dav_name=:dav_name'; + $qry->QDo('SELECT dav_id FROM caldav_data WHERE dav_name = :dav_name ', array(':dav_name' => $path)); } - if ( !$qry->QDo($sql,$params) ) { + if ( $qry->rows() != 1 || !($row = $qry->Fetch()) ) { + // No dav_id? => We're toast! rollback_on_error( $caldav_context, $user_no, $path); return false; } - - $qry->QDo('SELECT dav_id FROM caldav_data WHERE dav_name = :dav_name ', array(':dav_name' => $path)); - if ( $qry->rows() == 1 && $row = $qry->Fetch() ) { - $dav_id = $row->dav_id; - } - - - $calitem_params = array( - ':dav_name' => $path, - ':user_no' => $user_no, - ':etag' => $etag - ); + $dav_id = $row->dav_id; + $dav_params[':dav_id'] = $dav_id; + $calitem_params[':dav_id'] = $dav_id; + $dtstart = $first->GetPValue('DTSTART'); $calitem_params[':dtstart'] = $dtstart; if ( (!isset($dtstart) || $dtstart == '') && $first->GetPValue('DUE') != '' ) { @@ -832,18 +824,21 @@ function write_resource( $user_no, $path, $caldav_data, $collection_id, $author, } } - $last_modified = $first->GetPValue('LAST-MODIFIED'); - if ( !isset($last_modified) || $last_modified == '' ) { - $last_modified = gmdate( 'Ymd\THis\Z' ); - } - $calitem_params[':modified'] = $last_modified; - $dtstamp = $first->GetPValue('DTSTAMP'); if ( !isset($dtstamp) || $dtstamp == '' ) { - $dtstamp = $last_modified; + // Strictly, this is an out of spec component, but we'll try and cope + $dtstamp = gmdate( 'Ymd\THis\Z' ); } $calitem_params[':dtstamp'] = $dtstamp; + $last_modified = $first->GetPValue('LAST-MODIFIED'); + if ( !isset($last_modified) || $last_modified == '' ) $last_modified = $dtstamp; + $dav_params[':modified'] = $last_modified; + $calitem_params[':modified'] = $last_modified; + + $created = $first->GetPValue('CREATED'); + if ( $created == '00001231T000000Z' ) $created = '20001231T000000Z'; + $class = $first->GetPValue('CLASS'); /* Check and see if we should over ride the class. */ /** @TODO: is there some way we can move this out of this function? Or at least get rid of the need for the SQL query here. */ @@ -910,9 +905,6 @@ function write_resource( $user_no, $path, $caldav_data, $collection_id, $author, } - $created = $first->GetPValue('CREATED'); - if ( $created == '00001231T000000Z' ) $created = '20001231T000000Z'; - $calitem_params[':created'] = $created; $calitem_params[':tzid'] = $tzid; $calitem_params[':uid'] = $first->GetPValue('UID'); @@ -926,6 +918,28 @@ function write_resource( $user_no, $path, $caldav_data, $collection_id, $author, $calitem_params[':due'] = $first->GetPValue('DUE'); $calitem_params[':percent_complete'] = $first->GetPValue('PERCENT-COMPLETE'); $calitem_params[':status'] = $first->GetPValue('STATUS'); + + if ( !isset($dav_params[':modified']) ) $dav_params[':modified'] = 'now'; + if ( $put_action_type == 'INSERT' ) { + create_scheduling_requests($vcal); + $sql = 'INSERT INTO caldav_data ( dav_id, user_no, dav_name, dav_etag, caldav_data, caldav_type, logged_user, created, modified, collection_id, weak_etag ) + VALUES( :dav_id, :user_no, :dav_name, :etag, :dav_data, :caldav_type, :session_user, :created, :modified, :collection_id, :weak_etag )'; + $dav_params[':collection_id'] = $collection_id; + $dav_params[':user_no'] = $user_no; + $dav_params[':dav_name'] = $path; + $dav_params[':created'] = (isset($created) && $created != '' ? $created : $dtstamp); + } + else { + update_scheduling_requests($vcal); + $sql = 'UPDATE caldav_data SET caldav_data=:dav_data, dav_etag=:etag, caldav_type=:caldav_type, logged_user=:session_user, + modified=:modified, weak_etag=:weak_etag WHERE dav_id=:dav_id'; + } + if ( !$qry->QDo($sql,$dav_params) ) { + rollback_on_error( $caldav_context, $user_no, $path); + return false; + } + + if ( $put_action_type == 'INSERT' ) { $sql = <<2006-10-25 10:13:27< dtstart: >2006-10-25 09:15:00< due: >NULL< + last_modified: >2006-10-25 10:13:27< location: >NULL< logged_user: >10< percent_complete: >NULL< @@ -59,5 +60,4 @@ END:VCALENDAR uid: >B18CBB57295D01D7661A6DD4@D76FAF7B10D9E8D2D41F779C< url: >NULL< user_no: >10< - ~ Modified Now: >1< diff --git a/testing/tests/regression-suite/0010-Mulberry-PUT-1.test b/testing/tests/regression-suite/0010-Mulberry-PUT-1.test index 79546fb1..38b5e783 100644 --- a/testing/tests/regression-suite/0010-Mulberry-PUT-1.test +++ b/testing/tests/regression-suite/0010-Mulberry-PUT-1.test @@ -42,10 +42,11 @@ ENDDATA QUERY SELECT caldav_data.user_no, caldav_type, logged_user, - uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location, + uid, dtstamp, dtstart at time zone tz_locn as dtstart, + dtend at time zone tz_locn as dtend, due, summary, location, description, priority, class, transp, rrule, url, percent_complete, tz_id, status, - ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now", + last_modified, caldav_data AS "A1 CalDAV DATA" FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id) WHERE caldav_data.dav_name ~ '^/user1/home/' diff --git a/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result b/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result index 92a6da68..608dbf5b 100644 --- a/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result +++ b/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result @@ -2,7 +2,7 @@ HTTP/1.1 204 No Content Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -ETag: "557e551fae1b5c7f2131bde1ba0ba01e" +ETag: "6cff373f55c3e8318ad1c0db93205d08" Content-Length: 0 Content-Type: text/plain; charset="utf-8" @@ -32,7 +32,7 @@ TZOFFSETTO:+1200 END:STANDARD END:VTIMEZONE BEGIN:VEVENT -DTSTAMP:20061025T101327Z +DTSTAMP:20061107T031419Z DTSTART;TZID=New Zealand Standard Time:20061025T091500 DURATION:PT1H SUMMARY:A first event, modified. @@ -44,9 +44,10 @@ END:VCALENDAR class: >PUBLIC< description: >NULL< dtend: >2006-10-25 10:15:00< - dtstamp: >2006-10-25 10:13:27< + dtstamp: >2006-11-07 03:14:19< dtstart: >2006-10-25 09:15:00< due: >NULL< + last_modified: >2006-11-07 03:14:19< location: >NULL< logged_user: >10< percent_complete: >NULL< @@ -59,5 +60,4 @@ END:VCALENDAR uid: >B18CBB57295D01D7661A6DD4@D76FAF7B10D9E8D2D41F779C< url: >NULL< user_no: >10< - ~ Modified Now: >1< diff --git a/testing/tests/regression-suite/0011-Mulberry-PUT-1b.test b/testing/tests/regression-suite/0011-Mulberry-PUT-1b.test index c5bf1c61..2a5d791a 100644 --- a/testing/tests/regression-suite/0011-Mulberry-PUT-1b.test +++ b/testing/tests/regression-suite/0011-Mulberry-PUT-1b.test @@ -32,7 +32,7 @@ TZOFFSETTO:+1200 END:STANDARD END:VTIMEZONE BEGIN:VEVENT -DTSTAMP:20061025T101327Z +DTSTAMP:20061107T031419Z DTSTART;TZID=New Zealand Standard Time:20061025T091500 DURATION:PT1H SUMMARY:A first event, modified. @@ -50,7 +50,7 @@ SELECT caldav_data.user_no, caldav_type, logged_user, uid, due, summary, location, description, priority, class, transp, rrule, url, percent_complete, tz_id, status, - ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now", + last_modified, caldav_data AS "A1 CalDAV DATA" FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id) WHERE caldav_data.dav_name ~ '^/user1/home/' diff --git a/testing/tests/regression-suite/0020-Mulberry-DELETE-1.result b/testing/tests/regression-suite/0020-Mulberry-DELETE-1.result index f1408d08..31f5d5a6 100644 --- a/testing/tests/regression-suite/0020-Mulberry-DELETE-1.result +++ b/testing/tests/regression-suite/0020-Mulberry-DELETE-1.result @@ -6,6 +6,6 @@ Content-Length: 44 Content-Type: text/plain; charset="utf-8" Resource has changed on server - not deleted - dav_etag: >557e551fae1b5c7f2131bde1ba0ba01e< + dav_etag: >6cff373f55c3e8318ad1c0db93205d08< dav_name: >/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics< diff --git a/testing/tests/regression-suite/0021-Mulberry-DELETE-2.test b/testing/tests/regression-suite/0021-Mulberry-DELETE-2.test index f3420f81..45cc8705 100644 --- a/testing/tests/regression-suite/0021-Mulberry-DELETE-2.test +++ b/testing/tests/regression-suite/0021-Mulberry-DELETE-2.test @@ -2,7 +2,7 @@ # Do a DELETE with a correct etag which will succeed. TYPE=DELETE URL=http://mycaldav/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics -HEADER=If-Match: "557e551fae1b5c7f2131bde1ba0ba01e" +HEADER=If-Match: "6cff373f55c3e8318ad1c0db93205d08" HEAD QUERY diff --git a/testing/tests/regression-suite/0310-Chandler-PUT-1.result b/testing/tests/regression-suite/0310-Chandler-PUT-1.result index 7c0af632..308439c5 100644 --- a/testing/tests/regression-suite/0310-Chandler-PUT-1.result +++ b/testing/tests/regression-suite/0310-Chandler-PUT-1.result @@ -2,7 +2,62 @@ HTTP/1.1 201 Created Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -ETag: "0d7a68984bf525342d22b8924a57e8e2" +ETag: "55f02f66966ee150320383803d1e0d34" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + + A1 CalDAV DATA: >BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//PYVOBJECT//NONSGML Version 1//EN +BEGIN:VTIMEZONE +TZID:Pacific/Auckland +BEGIN:STANDARD +DTSTART:20000319T030000 +RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=3 +TZNAME:Pacific/Auckland +TZOFFSETFROM:+1300 +TZOFFSETTO:+1200 +END:STANDARD +BEGIN:DAYLIGHT +DTSTART:20001001T020000 +RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10 +TZNAME:Pacific/Auckland +TZOFFSETFROM:+1200 +TZOFFSETTO:+1300 +END:DAYLIGHT +END:VTIMEZONE +BEGIN:VEVENT +UID:71e2ae82-7870-11db-c6d6-f6927c144649 +DTSTAMP:20060511T043751Z +DTSTART;TZID=Pacific/Auckland:20061103T160000 +DTEND;TZID=Pacific/Auckland:20061103T174500 +DESCRIPTION: +LOCATION:Level 3 +RRULE:FREQ=WEEKLY;INTERVAL=2;UNTIL=20071222T235900 +STATUS:CONFIRMED +SUMMARY:Beer O'Clock +END:VEVENT +END:VCALENDAR +< + caldav_type: >VEVENT< + class: >PUBLIC< + description: >< + dtend: >2006-11-03 17:45:00< + dtstamp: >2006-05-11 04:37:51< + dtstart: >2006-11-03 16:00:00< + due: >NULL< + last_modified: >2006-05-11 04:37:51< + location: >Level 3< + logged_user: >10< + percent_complete: >NULL< + priority: >NULL< + rrule: >FREQ=WEEKLY;INTERVAL=2;UNTIL=20071222T235900< + status: >CONFIRMED< + summary: >Beer O'Clock< + transp: >NULL< + tz_id: >Pacific/Auckland< + uid: >71e2ae82-7870-11db-c6d6-f6927c144649< + url: >NULL< + user_no: >10< + diff --git a/testing/tests/regression-suite/0311-Chandler-PUT-2.result b/testing/tests/regression-suite/0311-Chandler-PUT-2.result index 32e9c949..bd7512ef 100644 --- a/testing/tests/regression-suite/0311-Chandler-PUT-2.result +++ b/testing/tests/regression-suite/0311-Chandler-PUT-2.result @@ -2,7 +2,45 @@ HTTP/1.1 201 Created Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -ETag: "421abf7e4848d2fecbf64217ed205d4b" +ETag: "6f16959eee5c920b45548840b1e9ea19" Content-Length: 0 Content-Type: text/plain; charset="utf-8" + + A1 CalDAV DATA: >BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//PYVOBJECT//NONSGML Version 1//EN +BEGIN:VEVENT +UID:da81c0ee-7871-11db-c6d6-f6927c144649 +DTSTAMP:20061024T115217Z +DTSTART:20061103T073000 +DTEND:20061103T093000 +DESCRIPTION: +LOCATION:Olivia's +RRULE:FREQ=MONTHLY +STATUS:CONFIRMED +SUMMARY:Morning Mgmt Mtg +END:VEVENT +END:VCALENDAR +< + caldav_type: >VEVENT< + class: >PUBLIC< + description: >< + dtend: >2006-11-03 09:30:00< + dtstamp: >2006-10-24 11:52:17< + dtstart: >2006-11-03 07:30:00< + due: >NULL< + last_modified: >2006-10-24 11:52:17< + location: >Olivia's< + logged_user: >10< + percent_complete: >NULL< + priority: >NULL< + rrule: >FREQ=MONTHLY< + status: >CONFIRMED< + summary: >Morning Mgmt Mtg< + transp: >NULL< + tz_id: >NULL< + uid: >da81c0ee-7871-11db-c6d6-f6927c144649< + url: >NULL< + user_no: >10< + diff --git a/testing/tests/regression-suite/0503-iCal-PROPFIND.result b/testing/tests/regression-suite/0503-iCal-PROPFIND.result index d328adb4..12af69cf 100644 --- a/testing/tests/regression-suite/0503-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0503-iCal-PROPFIND.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -ETag: "aa53c32e9f6870f0528351d6f73b283a" +ETag: "c30ae7a73f7f3c95895032994b51554d" Content-Length: 675 Content-Type: text/xml; charset="utf-8" @@ -13,7 +13,7 @@ Content-Type: text/xml; charset="utf-8" user1 home - "2bf1cd7e851d3961aa84e201035fddda" + "c4b202f2177d8839c95d715f26cf62da" diff --git a/testing/tests/regression-suite/0504-iCal-PROPFIND.result b/testing/tests/regression-suite/0504-iCal-PROPFIND.result index 7d2cb36e..f1fea422 100644 --- a/testing/tests/regression-suite/0504-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/0504-iCal-PROPFIND.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -ETag: "51a84c6ced23238efecbe36e6716ba9c" +ETag: "c0dc924dbe52600ea776c98136f289b0" Content-Length: 4155 Content-Type: text/xml; charset="utf-8" @@ -150,7 +150,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics - "0d7a68984bf525342d22b8924a57e8e2" + "55f02f66966ee150320383803d1e0d34" HTTP/1.1 200 OK @@ -160,7 +160,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics - "421abf7e4848d2fecbf64217ed205d4b" + "6f16959eee5c920b45548840b1e9ea19" HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/0505-iCal-PUT.result b/testing/tests/regression-suite/0505-iCal-PUT.result index 48c5685f..06d75eec 100644 --- a/testing/tests/regression-suite/0505-iCal-PUT.result +++ b/testing/tests/regression-suite/0505-iCal-PUT.result @@ -60,6 +60,7 @@ END:VCALENDAR dtstamp: >2007-11-23 09:30:48< dtstart: >2007-11-25 23:00:00< due: >NULL< + last_modified: >2007-11-23 09:30:48< location: >NULL< logged_user: >10< percent_complete: >NULL< @@ -72,5 +73,4 @@ END:VCALENDAR uid: >AAA9318E-37D9-4319-8626-95ECD3D3B243< url: >NULL< user_no: >10< - ~ Modified Now: >1< diff --git a/testing/tests/regression-suite/0505-iCal-PUT.test b/testing/tests/regression-suite/0505-iCal-PUT.test index 54358d23..b5f00ff2 100644 --- a/testing/tests/regression-suite/0505-iCal-PUT.test +++ b/testing/tests/regression-suite/0505-iCal-PUT.test @@ -63,7 +63,7 @@ SELECT caldav_data.user_no, caldav_type, logged_user, description, priority, class, transp, rrule, url, percent_complete, tz_id, status, caldav_data AS " CalDAV Data", - ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now" + last_modified FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id) WHERE caldav_data.dav_etag = 'b3e66a461ef178bd4791b2b6509bbb9d'; diff --git a/testing/tests/regression-suite/0506-iCal-PUT.result b/testing/tests/regression-suite/0506-iCal-PUT.result index 189e1eaa..6b4e9957 100644 --- a/testing/tests/regression-suite/0506-iCal-PUT.result +++ b/testing/tests/regression-suite/0506-iCal-PUT.result @@ -2,7 +2,7 @@ HTTP/1.1 204 No Content Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -ETag: "5f050eca5480bbebbe9428222570913d" +ETag: "efd0257efbc898d059c200d1391af060" Content-Length: 0 Content-Type: text/plain; charset="utf-8" @@ -40,7 +40,7 @@ SEQUENCE:6 TRANSP:OPAQUE UID:AAA9318E-37D9-4319-8626-95ECD3D3B243 DTSTART;TZID=Pacific/Auckland:20071125T130000 -DTSTAMP:20071123T093223Z +DTSTAMP:20071124T224850Z SUMMARY:BBQ @ ML's CREATED:20071123T093048Z DTEND;TZID=Pacific/Auckland:20071125T190000 @@ -58,9 +58,10 @@ END:VCALENDAR class: >PUBLIC< description: >NULL< dtend: >2007-11-25 19:00:00< - dtstamp: >2007-11-23 09:32:23< + dtstamp: >2007-11-24 22:48:50< dtstart: >2007-11-25 13:00:00< due: >NULL< + last_modified: >2007-11-24 22:48:50< location: >ML's House< logged_user: >10< percent_complete: >NULL< @@ -73,5 +74,4 @@ END:VCALENDAR uid: >AAA9318E-37D9-4319-8626-95ECD3D3B243< url: >NULL< user_no: >10< - ~ Modified Now: >1< diff --git a/testing/tests/regression-suite/0506-iCal-PUT.test b/testing/tests/regression-suite/0506-iCal-PUT.test index a4843304..e35001d1 100644 --- a/testing/tests/regression-suite/0506-iCal-PUT.test +++ b/testing/tests/regression-suite/0506-iCal-PUT.test @@ -43,7 +43,7 @@ SEQUENCE:6 TRANSP:OPAQUE UID:AAA9318E-37D9-4319-8626-95ECD3D3B243 DTSTART;TZID=Pacific/Auckland:20071125T130000 -DTSTAMP:20071123T093223Z +DTSTAMP:20071124T224850Z SUMMARY:BBQ @ ML's CREATED:20071123T093048Z DTEND;TZID=Pacific/Auckland:20071125T190000 @@ -65,8 +65,8 @@ SELECT caldav_data.user_no, caldav_type, logged_user, description, priority, class, transp, rrule, url, percent_complete, tz_id, status, caldav_data AS " CalDAV Data", - ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now" + last_modified FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id) WHERE caldav_data.dav_etag = -'5f050eca5480bbebbe9428222570913d'; +'efd0257efbc898d059c200d1391af060'; ENDQUERY diff --git a/testing/tests/regression-suite/0508-iCal-REPORT.result b/testing/tests/regression-suite/0508-iCal-REPORT.result index 5d27de8f..5aa3e745 100644 --- a/testing/tests/regression-suite/0508-iCal-REPORT.result +++ b/testing/tests/regression-suite/0508-iCal-REPORT.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -ETag: "72e80e517b5e1c056e229b6985200b27" +ETag: "caba91d5411c487320e8acc717f44528" Content-Length: 1389 Content-Type: text/xml; charset="utf-8" @@ -12,7 +12,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics - "5f050eca5480bbebbe9428222570913d" + "efd0257efbc898d059c200d1391af060" BEGIN:VCALENDAR VERSION:2.0 PRODID:-//Apple Inc.//iCal 3.0//EN @@ -46,7 +46,7 @@ SEQUENCE:6 TRANSP:OPAQUE UID:AAA9318E-37D9-4319-8626-95ECD3D3B243 DTSTART;TZID=Pacific/Auckland:20071125T130000 -DTSTAMP:20071123T093223Z +DTSTAMP:20071124T224850Z SUMMARY:BBQ @ ML's CREATED:20071123T093048Z DTEND;TZID=Pacific/Auckland:20071125T190000 diff --git a/testing/tests/regression-suite/0512-iCal-PUT.result b/testing/tests/regression-suite/0512-iCal-PUT.result index d374b798..4d1f0e29 100644 --- a/testing/tests/regression-suite/0512-iCal-PUT.result +++ b/testing/tests/regression-suite/0512-iCal-PUT.result @@ -61,6 +61,7 @@ END:VCALENDAR dtstamp: >2007-11-24 08:37:09< dtstart: >2007-11-26 22:00:00< due: >NULL< + last_modified: >2007-11-24 08:37:09< location: >NULL< logged_user: >10< percent_complete: >NULL< @@ -73,5 +74,4 @@ END:VCALENDAR uid: >6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA< url: >NULL< user_no: >10< - ~ Modified Now: >1< diff --git a/testing/tests/regression-suite/0512-iCal-PUT.test b/testing/tests/regression-suite/0512-iCal-PUT.test index bb55d290..3b41687b 100644 --- a/testing/tests/regression-suite/0512-iCal-PUT.test +++ b/testing/tests/regression-suite/0512-iCal-PUT.test @@ -62,8 +62,7 @@ SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location, description, priority, class, transp, rrule, url, percent_complete, tz_id, status, - caldav_data AS " CalDAV Data", - ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now" + caldav_data AS " CalDAV Data", last_modified FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id) WHERE caldav_data.dav_name = '/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA.ics'; diff --git a/testing/tests/regression-suite/0513-iCal-PUT.result b/testing/tests/regression-suite/0513-iCal-PUT.result index f2bc0f63..067cecca 100644 --- a/testing/tests/regression-suite/0513-iCal-PUT.result +++ b/testing/tests/regression-suite/0513-iCal-PUT.result @@ -2,7 +2,7 @@ HTTP/1.1 204 No Content Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -ETag: "087d1ea4915719b8a904ca18a9abbbe1" +ETag: "6079c141bc189326bf2432a8426c4242" Content-Length: 0 Content-Type: text/plain; charset="utf-8" @@ -40,7 +40,7 @@ SEQUENCE:5 TRANSP:OPAQUE UID:6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA DTSTART;TZID=Pacific/Auckland:20071126T070000 -DTSTAMP:20071124T083810Z +DTSTAMP:20071124T084239Z SUMMARY:Go to work CREATED:20071124T083709Z DTEND;TZID=Pacific/Auckland:20071126T170000 @@ -56,12 +56,13 @@ END:VCALENDAR < caldav_type: >VEVENT< class: >PUBLIC< - dav_etag: >087d1ea4915719b8a904ca18a9abbbe1< + dav_etag: >6079c141bc189326bf2432a8426c4242< description: >NULL< dtend: >2007-11-26 17:00:00< - dtstamp: >2007-11-24 08:38:10< + dtstamp: >2007-11-24 08:42:39< dtstart: >2007-11-26 07:00:00< due: >NULL< + last_modified: >2007-11-24 08:42:39< location: >NULL< logged_user: >10< percent_complete: >NULL< @@ -74,5 +75,4 @@ END:VCALENDAR uid: >6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA< url: >NULL< user_no: >10< - ~ Modified Now: >1< diff --git a/testing/tests/regression-suite/0513-iCal-PUT.test b/testing/tests/regression-suite/0513-iCal-PUT.test index a218d9ff..43c545e3 100644 --- a/testing/tests/regression-suite/0513-iCal-PUT.test +++ b/testing/tests/regression-suite/0513-iCal-PUT.test @@ -46,7 +46,7 @@ SEQUENCE:5 TRANSP:OPAQUE UID:6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA DTSTART;TZID=Pacific/Auckland:20071126T070000 -DTSTAMP:20071124T083810Z +DTSTAMP:20071124T084239Z SUMMARY:Go to work CREATED:20071124T083709Z DTEND;TZID=Pacific/Auckland:20071126T170000 @@ -67,10 +67,9 @@ SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location, description, priority, class, transp, rrule, url, percent_complete, tz_id, status, - caldav_data AS " CalDAV Data", - ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now" + caldav_data AS " CalDAV Data", last_modified FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id) -WHERE caldav_data.dav_etag = -'087d1ea4915719b8a904ca18a9abbbe1'; +WHERE caldav_data.dav_name = + '/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA.ics'; ENDQUERY diff --git a/testing/tests/regression-suite/0514-iCal-PUT-VTODO.result b/testing/tests/regression-suite/0514-iCal-PUT-VTODO.result index d886f5e2..7a80eb5d 100644 --- a/testing/tests/regression-suite/0514-iCal-PUT-VTODO.result +++ b/testing/tests/regression-suite/0514-iCal-PUT-VTODO.result @@ -50,6 +50,7 @@ END:VCALENDAR dtstamp: >2007-11-24 22:09:25< dtstart: >2004-01-01 12:00:00< due: >2010-02-17 00:00:00< + last_modified: >2007-11-24 22:09:25< location: >NULL< logged_user: >10< percent_complete: >NULL< @@ -62,5 +63,4 @@ END:VCALENDAR uid: >E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74< url: >NULL< user_no: >10< - ~ Modified Now: >1< diff --git a/testing/tests/regression-suite/0514-iCal-PUT-VTODO.test b/testing/tests/regression-suite/0514-iCal-PUT-VTODO.test index bd6bc563..e45ca1c8 100644 --- a/testing/tests/regression-suite/0514-iCal-PUT-VTODO.test +++ b/testing/tests/regression-suite/0514-iCal-PUT-VTODO.test @@ -51,8 +51,7 @@ SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due at time zone tz_locn as due, summary, location, description, priority, class, transp, rrule, url, percent_complete, tz_id, status, - caldav_data AS " CalDAV Data", - ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now" + caldav_data AS " CalDAV Data", last_modified FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id) WHERE caldav_data.dav_name = '/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74.ics'; diff --git a/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.result b/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.result index 8484be68..66b7be07 100644 --- a/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.result +++ b/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.result @@ -73,6 +73,7 @@ END:VCALENDAR dtstamp: >2007-11-24 22:19:00< dtstart: >2007-11-23 12:00:00< due: >NULL< + last_modified: >2007-11-24 22:19:00< location: >NULL< logged_user: >10< percent_complete: >NULL< @@ -85,5 +86,4 @@ END:VCALENDAR uid: >3C1BF85D-3F28-413F-844F-80EBD33B8EE6< url: >NULL< user_no: >101< - ~ Modified Now: >1< diff --git a/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.test b/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.test index 35324b93..a40fd9c1 100644 --- a/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.test +++ b/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.test @@ -72,8 +72,7 @@ SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location, description, priority, class, transp, rrule, url, percent_complete, tz_id, status, - caldav_data AS " CalDAV Data", - ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now" + caldav_data AS " CalDAV Data", last_modified FROM caldav_data JOIN calendar_item USING(dav_name) LEFT JOIN time_zone USING (tz_id) WHERE caldav_data.dav_name = '/resource2/home/3C1BF85D-3F28-413F-844F-80EBD33B8EE6.ics'; diff --git a/testing/tests/regression-suite/0532-iCal4-PROPFIND.result b/testing/tests/regression-suite/0532-iCal4-PROPFIND.result index aa2fe206..a8e51b12 100644 --- a/testing/tests/regression-suite/0532-iCal4-PROPFIND.result +++ b/testing/tests/regression-suite/0532-iCal4-PROPFIND.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -ETag: "8d88eaeaf66ddaf4e4c40dede428a0ea" +ETag: "b0a852bb7a7c95269f916f12bbcbdb10" Content-Length: 15088 Content-Type: text/xml; charset="utf-8" @@ -82,7 +82,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/ - "9a28f344c1e0032e5967806f193a7cb7" + "ce9a871cfb30dd7b7f94481944f3769b" user1 home diff --git a/testing/tests/regression-suite/0536-iCal4-PROPFIND.result b/testing/tests/regression-suite/0536-iCal4-PROPFIND.result index a9fa0995..6c45753d 100644 --- a/testing/tests/regression-suite/0536-iCal4-PROPFIND.result +++ b/testing/tests/regression-suite/0536-iCal4-PROPFIND.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -ETag: "78317cedf5ac64209ccd8079a3194e8f" +ETag: "6466df744e5f263784fd0e85915683b6" Content-Length: 4421 Content-Type: text/xml; charset="utf-8" @@ -150,7 +150,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics - "0d7a68984bf525342d22b8924a57e8e2" + "55f02f66966ee150320383803d1e0d34" HTTP/1.1 200 OK @@ -160,7 +160,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics - "421abf7e4848d2fecbf64217ed205d4b" + "6f16959eee5c920b45548840b1e9ea19" HTTP/1.1 200 OK @@ -170,7 +170,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics - "5f050eca5480bbebbe9428222570913d" + "efd0257efbc898d059c200d1391af060" HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/0550-iPhone-REPORT.result b/testing/tests/regression-suite/0550-iPhone-REPORT.result index b5dac129..3dd87dd2 100644 --- a/testing/tests/regression-suite/0550-iPhone-REPORT.result +++ b/testing/tests/regression-suite/0550-iPhone-REPORT.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -ETag: "160cbfd2f93fae8c193c87b0fa8b8c6a" +ETag: "2e6245a9dbcab04c95bbfe73fae7e497" Content-Length: 1146 Content-Type: text/xml; charset="utf-8" @@ -22,7 +22,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics - "0d7a68984bf525342d22b8924a57e8e2" + "55f02f66966ee150320383803d1e0d34" HTTP/1.1 200 OK @@ -32,7 +32,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics - "421abf7e4848d2fecbf64217ed205d4b" + "6f16959eee5c920b45548840b1e9ea19" HTTP/1.1 200 OK @@ -42,7 +42,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics - "5f050eca5480bbebbe9428222570913d" + "efd0257efbc898d059c200d1391af060" HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/0551-iPhone-REPORT.result b/testing/tests/regression-suite/0551-iPhone-REPORT.result index 96359a91..1b7092ad 100644 --- a/testing/tests/regression-suite/0551-iPhone-REPORT.result +++ b/testing/tests/regression-suite/0551-iPhone-REPORT.result @@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -ETag: "2e7702d874d6a53c957bf59a6220d2c9" -Content-Length: 4411 +ETag: "d991e899426181952a974530d490423f" +Content-Length: 4448 Content-Type: text/xml; charset="utf-8" @@ -63,7 +63,7 @@ END:VCALENDAR /caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics - "0d7a68984bf525342d22b8924a57e8e2" + "55f02f66966ee150320383803d1e0d34" BEGIN:VCALENDAR VERSION:2.0 PRODID:-//PYVOBJECT//NONSGML Version 1//EN @@ -86,6 +86,7 @@ END:DAYLIGHT END:VTIMEZONE BEGIN:VEVENT UID:71e2ae82-7870-11db-c6d6-f6927c144649 +DTSTAMP:20060511T043751Z DTSTART;TZID=Pacific/Auckland:20061103T160000 DTEND;TZID=Pacific/Auckland:20061103T174500 DESCRIPTION: @@ -104,21 +105,22 @@ END:VCALENDAR /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics - "421abf7e4848d2fecbf64217ed205d4b" - BEGIN:VCALENDAR -VERSION:2.0 -PRODID:-//PYVOBJECT//NONSGML Version 1//EN -BEGIN:VEVENT -UID:da81c0ee-7871-11db-c6d6-f6927c144649 -DTSTART:20061103T073000 -DTEND:20061103T093000 -DESCRIPTION: -LOCATION:Olivia's -RRULE:FREQ=MONTHLY -STATUS:CONFIRMED -SUMMARY:Morning Mgmt Mtg -END:VEVENT -END:VCALENDAR + "6f16959eee5c920b45548840b1e9ea19" + BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//PYVOBJECT//NONSGML Version 1//EN +BEGIN:VEVENT +UID:da81c0ee-7871-11db-c6d6-f6927c144649 +DTSTAMP:20061024T115217Z +DTSTART:20061103T073000 +DTEND:20061103T093000 +DESCRIPTION: +LOCATION:Olivia's +RRULE:FREQ=MONTHLY +STATUS:CONFIRMED +SUMMARY:Morning Mgmt Mtg +END:VEVENT +END:VCALENDAR HTTP/1.1 200 OK @@ -128,7 +130,7 @@ END:VCALENDAR /caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics - "5f050eca5480bbebbe9428222570913d" + "efd0257efbc898d059c200d1391af060" BEGIN:VCALENDAR VERSION:2.0 PRODID:-//Apple Inc.//iCal 3.0//EN @@ -162,7 +164,7 @@ SEQUENCE:6 TRANSP:OPAQUE UID:AAA9318E-37D9-4319-8626-95ECD3D3B243 DTSTART;TZID=Pacific/Auckland:20071125T130000 -DTSTAMP:20071123T093223Z +DTSTAMP:20071124T224850Z SUMMARY:BBQ @ ML's CREATED:20071123T093048Z DTEND;TZID=Pacific/Auckland:20071125T190000 diff --git a/testing/tests/regression-suite/0555-iPhone-REPORT.result b/testing/tests/regression-suite/0555-iPhone-REPORT.result index 53c2c5f8..3dc31174 100644 --- a/testing/tests/regression-suite/0555-iPhone-REPORT.result +++ b/testing/tests/regression-suite/0555-iPhone-REPORT.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -ETag: "2389a13c9217f7969b16f81ba7ef6985" +ETag: "571aa22469ee7442c32ba35664da10de" Content-Length: 880 Content-Type: text/xml; charset="utf-8" @@ -22,7 +22,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics - "421abf7e4848d2fecbf64217ed205d4b" + "6f16959eee5c920b45548840b1e9ea19" HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/0598-REPORT-sync-initial.result b/testing/tests/regression-suite/0598-REPORT-sync-initial.result index 97c107d5..77f3d750 100644 --- a/testing/tests/regression-suite/0598-REPORT-sync-initial.result +++ b/testing/tests/regression-suite/0598-REPORT-sync-initial.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -ETag: "c29998d7908f44ede51a3f29caf732f6" +ETag: "745883b4e0a01c261f2ae80105258a14" Content-Length: 4024 Content-Type: text/xml; charset="utf-8" @@ -120,7 +120,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics - "0d7a68984bf525342d22b8924a57e8e2" + "55f02f66966ee150320383803d1e0d34" HTTP/1.1 200 OK @@ -129,7 +129,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics - "421abf7e4848d2fecbf64217ed205d4b" + "6f16959eee5c920b45548840b1e9ea19" HTTP/1.1 200 OK @@ -138,7 +138,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics - "5f050eca5480bbebbe9428222570913d" + "efd0257efbc898d059c200d1391af060" HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/0599-REPORT-sync-changed.result b/testing/tests/regression-suite/0599-REPORT-sync-changed.result index a03e3ff9..b4db3181 100644 --- a/testing/tests/regression-suite/0599-REPORT-sync-changed.result +++ b/testing/tests/regression-suite/0599-REPORT-sync-changed.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -ETag: "836e3b36ea894475748ebcb1759a299f" +ETag: "41c9017eda1f4a021c881f217b97407a" Content-Length: 3780 Content-Type: text/xml; charset="utf-8" @@ -66,7 +66,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics - "0d7a68984bf525342d22b8924a57e8e2" + "55f02f66966ee150320383803d1e0d34" HTTP/1.1 200 OK @@ -93,7 +93,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics - "5f050eca5480bbebbe9428222570913d" + "efd0257efbc898d059c200d1391af060" HTTP/1.1 200 OK @@ -111,7 +111,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics - "421abf7e4848d2fecbf64217ed205d4b" + "6f16959eee5c920b45548840b1e9ea19" HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/0701-caldav4j-PUT.result b/testing/tests/regression-suite/0701-caldav4j-PUT.result index 5ebcb718..b8b8ec60 100644 --- a/testing/tests/regression-suite/0701-caldav4j-PUT.result +++ b/testing/tests/regression-suite/0701-caldav4j-PUT.result @@ -46,6 +46,7 @@ END:VCALENDAR dtstamp: >2009-05-15 09:53:26< dtstart: >2006-01-01 17:00:00< due: >NULL< + last_modified: >2009-05-15 09:53:26< location: >NULL< logged_user: >10< percent_complete: >NULL< @@ -58,5 +59,4 @@ END:VCALENDAR uid: >DE916949-731D-4DAE-BA93-48A38B2B2030< url: >NULL< user_no: >10< - ~ Modified Now: >1< diff --git a/testing/tests/regression-suite/0701-caldav4j-PUT.test b/testing/tests/regression-suite/0701-caldav4j-PUT.test index 1ff0ea97..b319a443 100644 --- a/testing/tests/regression-suite/0701-caldav4j-PUT.test +++ b/testing/tests/regression-suite/0701-caldav4j-PUT.test @@ -47,8 +47,7 @@ SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location, description, priority, class, transp, rrule, url, percent_complete, tz_id, status, - caldav_data AS " CalDAV Data", - ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now" + caldav_data AS " CalDAV Data", last_modified FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id) WHERE caldav_data.dav_name = '/user1/collection/Daily_NY_5pm.ics' diff --git a/testing/tests/regression-suite/0702-caldav4j-PUT.result b/testing/tests/regression-suite/0702-caldav4j-PUT.result index 31e82ddd..52f2b76c 100644 --- a/testing/tests/regression-suite/0702-caldav4j-PUT.result +++ b/testing/tests/regression-suite/0702-caldav4j-PUT.result @@ -45,6 +45,7 @@ END:VCALENDAR dtstamp: >2009-05-15 09:53:26< dtstart: >2006-01-01 00:00:00< due: >NULL< + last_modified: >2009-05-15 09:53:26< location: >NULL< logged_user: >10< percent_complete: >NULL< @@ -57,5 +58,4 @@ END:VCALENDAR uid: >C68DADAD-37CE-44F7-8A37-52E1D02E29CA< url: >NULL< user_no: >10< - ~ Modified Now: >1< diff --git a/testing/tests/regression-suite/0702-caldav4j-PUT.test b/testing/tests/regression-suite/0702-caldav4j-PUT.test index 922c0709..bbc2b13a 100644 --- a/testing/tests/regression-suite/0702-caldav4j-PUT.test +++ b/testing/tests/regression-suite/0702-caldav4j-PUT.test @@ -43,11 +43,11 @@ ENDDATA QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, - uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location, + uid, dtstamp, dtstart at time zone tz_locn as dtstart, + dtend at time zone tz_locn as dtend, due, summary, location, description, priority, class, transp, rrule, url, percent_complete, tz_id, status, - caldav_data AS " CalDAV Data", - ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now" + caldav_data AS " CalDAV Data", last_modified FROM caldav_data JOIN calendar_item USING(dav_name) LEFT JOIN time_zone USING (tz_id) WHERE caldav_data.dav_name = '/user1/collection/All_Day_NY_JAN1.ics' diff --git a/testing/tests/regression-suite/0817-Spec-PUT.result b/testing/tests/regression-suite/0817-Spec-PUT.result index 85c02b24..a38989b9 100644 --- a/testing/tests/regression-suite/0817-Spec-PUT.result +++ b/testing/tests/regression-suite/0817-Spec-PUT.result @@ -47,6 +47,7 @@ END:VCALENDAR dtstamp: >2008-10-24 22:09:25< dtstart: >2008-11-14 00:00:00< due: >NULL< + last_modified: >2008-10-24 22:09:25< location: >NULL< logged_user: >10< percent_complete: >NULL< @@ -59,6 +60,5 @@ END:VCALENDAR uid: >DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74< url: >NULL< user_no: >10< - ~ Modified Now: >1< ~Duration: >1 day< diff --git a/testing/tests/regression-suite/0817-Spec-PUT.test b/testing/tests/regression-suite/0817-Spec-PUT.test index 1139fa8f..8df398c0 100644 --- a/testing/tests/regression-suite/0817-Spec-PUT.test +++ b/testing/tests/regression-suite/0817-Spec-PUT.test @@ -45,11 +45,11 @@ ENDDATA QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, - uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location, + uid, dtstamp, dtstart at time zone tz_locn as dtstart, + dtend at time zone tz_locn as dtend, due, summary, location, description, priority, class, transp, rrule, url, percent_complete, tz_id, status, - caldav_data AS " CalDAV Data", - ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now", + caldav_data AS " CalDAV Data", last_modified, dtend - dtstart AS "~Duration" FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id) WHERE caldav_data.dav_name = diff --git a/testing/tests/regression-suite/0818-Spec-PUT.result b/testing/tests/regression-suite/0818-Spec-PUT.result index faeb60b9..5da678cc 100644 --- a/testing/tests/regression-suite/0818-Spec-PUT.result +++ b/testing/tests/regression-suite/0818-Spec-PUT.result @@ -2,7 +2,7 @@ HTTP/1.1 201 Created Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -ETag: "8600dc4a1b264a09a5f741d710497cba" +ETag: "2a09ef8c6a9e0b6bc16228359b99d8e7" Content-Length: 0 Content-Type: text/plain; charset="utf-8" @@ -31,22 +31,24 @@ END:VTIMEZONE BEGIN:VEVENT DESCRIPTION:Have a microparty. All the best parties are monthly! UID:MICROPARTY-77C6-4FB7-BDD3-6882E2F1BE74 -DTSTAMP:20081024T220925Z +DTSTAMP:20081027T074326Z SUMMARY:Woohoo! Time to Par-tay! CREATED:20081024T220749Z DTSTART;TZID=Pacific/Auckland:20081121T160000 +DURATION:PT3H RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=3FR END:VEVENT END:VCALENDAR < caldav_type: >VEVENT< class: >PUBLIC< - dav_etag: >8600dc4a1b264a09a5f741d710497cba< + dav_etag: >2a09ef8c6a9e0b6bc16228359b99d8e7< description: >Have a microparty. All the best parties are monthly!< - dtend: >2008-11-21 16:00:00< - dtstamp: >2008-10-24 22:09:25< + dtend: >2008-11-21 19:00:00< + dtstamp: >2008-10-27 07:43:26< dtstart: >2008-11-21 16:00:00< due: >NULL< + last_modified: >2008-10-27 07:43:26< location: >NULL< logged_user: >10< percent_complete: >NULL< @@ -59,6 +61,5 @@ END:VCALENDAR uid: >MICROPARTY-77C6-4FB7-BDD3-6882E2F1BE74< url: >NULL< user_no: >10< - ~ Modified Now: >1< - ~Duration: >00:00:00< + ~Duration: >03:00:00< diff --git a/testing/tests/regression-suite/0818-Spec-PUT.test b/testing/tests/regression-suite/0818-Spec-PUT.test index b4d7fb8e..316e802b 100644 --- a/testing/tests/regression-suite/0818-Spec-PUT.test +++ b/testing/tests/regression-suite/0818-Spec-PUT.test @@ -33,10 +33,11 @@ END:VTIMEZONE BEGIN:VEVENT DESCRIPTION:Have a microparty. All the best parties are monthly! UID:MICROPARTY-77C6-4FB7-BDD3-6882E2F1BE74 -DTSTAMP:20081024T220925Z +DTSTAMP:20081027T074326Z SUMMARY:Woohoo! Time to Par-tay! CREATED:20081024T220749Z DTSTART;TZID=Pacific/Auckland:20081121T160000 +DURATION:PT3H RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=3FR END:VEVENT END:VCALENDAR @@ -45,11 +46,11 @@ ENDDATA QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, - uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location, + uid, dtstamp, dtstart at time zone tz_locn as dtstart, + dtend at time zone tz_locn as dtend, due, summary, location, description, priority, class, transp, rrule, url, percent_complete, tz_id, status, - caldav_data AS " CalDAV Data", - ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now", + caldav_data AS " CalDAV Data", last_modified, dtend - dtstart AS "~Duration" FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id) WHERE caldav_data.dav_name = diff --git a/testing/tests/regression-suite/0822-Spec-PROPFIND-3.result b/testing/tests/regression-suite/0822-Spec-PROPFIND-3.result index 0d7b48b2..2e4c06d4 100644 --- a/testing/tests/regression-suite/0822-Spec-PROPFIND-3.result +++ b/testing/tests/regression-suite/0822-Spec-PROPFIND-3.result @@ -4,7 +4,7 @@ /caldav.php/user1/home/ - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2009-06-03T00:00:00+12:00 user1 home httpd/unix-directory @@ -42,7 +42,7 @@ /caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2006-11-02T09:02:17+13:00 Lunch with David 747 @@ -77,7 +77,7 @@ /caldav.php/user1/home/20061101T073004Z.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2006-11-01T07:30:00+13:00 A Meeting 1059 @@ -112,7 +112,7 @@ /caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2006-11-20T04:13:36+13:00 Weekly Project Meeting 999 @@ -147,7 +147,7 @@ /caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2006-12-23T03:23:50+13:00 Confidential Event 956 @@ -182,7 +182,7 @@ /caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2006-12-23T03:14:15+13:00 Private Event 970 @@ -217,7 +217,7 @@ /caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2006-12-23T05:16:46+13:00 Tentative Event 929 @@ -252,7 +252,7 @@ /caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2007-08-05T20:02:15+12:00 Incomplete, uncancelled 415 @@ -287,7 +287,7 @@ /caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2007-08-05T20:15:57+12:00 50% Complete, uncancelled 449 @@ -322,7 +322,7 @@ /caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2007-08-05T20:16:47+12:00 Due 7/8/7 16:30, completed 961 @@ -357,7 +357,7 @@ /caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2007-08-06T22:32:44+12:00 A Cancelled Task, with a start and due date 1001 @@ -392,7 +392,7 @@ /caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2007-12-03T20:26:30+13:00 Morning Meeting 1119 @@ -427,7 +427,7 @@ /caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2007-12-03T20:29:15+13:00 Release 0.9.3 1013 @@ -462,12 +462,12 @@ /caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2006-05-11T04:37:51+12:00 Beer O'Clock - 743 + 769 text/calendar - "0d7a68984bf525342d22b8924a57e8e2" + "55f02f66966ee150320383803d1e0d34" Dow, 01 Jan 2000 00:00:00 GMT @@ -497,12 +497,12 @@ /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2006-10-24T11:52:17+13:00 Morning Mgmt Mtg - 302 + 313 text/calendar - "421abf7e4848d2fecbf64217ed205d4b" + "6f16959eee5c920b45548840b1e9ea19" Dow, 01 Jan 2000 00:00:00 GMT @@ -532,12 +532,12 @@ /caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2007-11-23T09:30:48+13:00 BBQ @ ML's 981 text/calendar - "5f050eca5480bbebbe9428222570913d" + "efd0257efbc898d059c200d1391af060" Dow, 01 Jan 2000 00:00:00 GMT @@ -567,7 +567,7 @@ /caldav.php/user1/home/70D23799-4A68-4905-AB9F-4D47BA693CFD.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2009-10-06T22:58:07+13:00 New Event 676 @@ -602,7 +602,7 @@ /caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2008-10-24T22:07:49+13:00 Party all day! 772 @@ -637,12 +637,12 @@ /caldav.php/user1/home/MICROPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics - YYYY-MM-DDThh:mm:ss+ZZ:ZZ + 2008-10-24T22:07:49+13:00 Woohoo! Time to Par-tay! - 786 + 800 text/calendar - "8600dc4a1b264a09a5f741d710497cba" + "2a09ef8c6a9e0b6bc16228359b99d8e7" Dow, 01 Jan 2000 00:00:00 GMT diff --git a/testing/tests/regression-suite/0822-Spec-PROPFIND-3.test b/testing/tests/regression-suite/0822-Spec-PROPFIND-3.test index 16218ee6..be417e43 100644 --- a/testing/tests/regression-suite/0822-Spec-PROPFIND-3.test +++ b/testing/tests/regression-suite/0822-Spec-PROPFIND-3.test @@ -7,7 +7,7 @@ HEADER=User-Agent: RFC2518 Spec Tests HEADER=Depth: infinity HEADER=Content-Type: application/xml -REPLACE=#2\d{3}-\d\d-\d\dT\d\d:\d\d:\d\d[+-]\d\d:\d\d#YYYY-MM-DDThh:mm:ss+ZZ:ZZ# +# REPLACE=#2\d{3}-\d\d-\d\dT\d\d:\d\d:\d\d[+-]\d\d:\d\d#YYYY-MM-DDThh:mm:ss+ZZ:ZZ# BEGINDATA diff --git a/testing/tests/regression-suite/0823-Spec-PROPFIND-4.result b/testing/tests/regression-suite/0823-Spec-PROPFIND-4.result index d9628578..721b60fe 100644 --- a/testing/tests/regression-suite/0823-Spec-PROPFIND-4.result +++ b/testing/tests/regression-suite/0823-Spec-PROPFIND-4.result @@ -92,9 +92,9 @@ YYYY-MM-DDThh:mm:ss+ZZ:ZZ Morning Mgmt Mtg - 302 + 313 text/calendar - "421abf7e4848d2fecbf64217ed205d4b" + "6f16959eee5c920b45548840b1e9ea19" Dow, 01 Jan 2000 00:00:00 GMT diff --git a/testing/tests/regression-suite/0825-Spec-PROPFIND-6.result b/testing/tests/regression-suite/0825-Spec-PROPFIND-6.result index d4caa593..821f6547 100644 --- a/testing/tests/regression-suite/0825-Spec-PROPFIND-6.result +++ b/testing/tests/regression-suite/0825-Spec-PROPFIND-6.result @@ -6,11 +6,11 @@ text/calendar - 302 + 313 Morning Mgmt Mtg Dow, 01 Jan 2000 00:00:00 GMT YYYY-MM-DDThh:mm:ss+ZZ:ZZ - "421abf7e4848d2fecbf64217ed205d4b" + "6f16959eee5c920b45548840b1e9ea19" diff --git a/testing/tests/regression-suite/0889-POST-freebusy.result b/testing/tests/regression-suite/0889-POST-freebusy.result index b9663c7f..be4263b1 100644 --- a/testing/tests/regression-suite/0889-POST-freebusy.result +++ b/testing/tests/regression-suite/0889-POST-freebusy.result @@ -1464,6 +1464,7 @@ FREEBUSY:20081118T180000Z/20081119T040000Z FREEBUSY:20081119T180000Z/20081120T040000Z FREEBUSY:20081119T184500Z/20081119T193000Z FREEBUSY:20081120T180000Z/20081121T040000Z +FREEBUSY:20081121T030000Z/20081121T060000Z FREEBUSY:20081123T180000Z/20081124T040000Z FREEBUSY:20081124T180000Z/20081125T040000Z FREEBUSY:20081124T184500Z/20081124T193000Z @@ -1494,6 +1495,7 @@ FREEBUSY:20081216T180000Z/20081217T040000Z FREEBUSY:20081217T180000Z/20081218T040000Z FREEBUSY:20081217T184500Z/20081217T193000Z FREEBUSY:20081218T180000Z/20081219T040000Z +FREEBUSY:20081219T030000Z/20081219T060000Z FREEBUSY:20081221T180000Z/20081222T040000Z FREEBUSY:20081222T180000Z/20081223T040000Z FREEBUSY:20081222T184500Z/20081222T193000Z @@ -1524,6 +1526,7 @@ FREEBUSY:20090113T180000Z/20090114T040000Z FREEBUSY:20090114T180000Z/20090115T040000Z FREEBUSY:20090114T184500Z/20090114T193000Z FREEBUSY:20090115T180000Z/20090116T040000Z +FREEBUSY:20090116T030000Z/20090116T060000Z FREEBUSY:20090118T180000Z/20090119T040000Z FREEBUSY:20090119T180000Z/20090120T040000Z FREEBUSY:20090119T184500Z/20090119T193000Z @@ -1561,6 +1564,7 @@ FREEBUSY:20090217T180000Z/20090218T040000Z FREEBUSY:20090218T180000Z/20090219T040000Z FREEBUSY:20090218T184500Z/20090218T193000Z FREEBUSY:20090219T180000Z/20090220T040000Z +FREEBUSY:20090220T030000Z/20090220T060000Z FREEBUSY:20090222T180000Z/20090223T040000Z FREEBUSY:20090223T180000Z/20090224T040000Z FREEBUSY:20090223T184500Z/20090223T193000Z @@ -1591,6 +1595,7 @@ FREEBUSY:20090317T180000Z/20090318T040000Z FREEBUSY:20090318T180000Z/20090319T040000Z FREEBUSY:20090318T184500Z/20090318T193000Z FREEBUSY:20090319T180000Z/20090320T040000Z +FREEBUSY:20090320T030000Z/20090320T060000Z FREEBUSY:20090322T180000Z/20090323T040000Z FREEBUSY:20090323T180000Z/20090324T040000Z FREEBUSY:20090323T184500Z/20090323T193000Z @@ -1621,6 +1626,7 @@ FREEBUSY:20090414T190000Z/20090415T050000Z FREEBUSY:20090415T190000Z/20090416T050000Z FREEBUSY:20090415T194500Z/20090415T203000Z FREEBUSY:20090416T190000Z/20090417T050000Z +FREEBUSY:20090417T040000Z/20090417T070000Z FREEBUSY:20090419T190000Z/20090420T050000Z FREEBUSY:20090420T190000Z/20090421T050000Z FREEBUSY:20090420T194500Z/20090420T203000Z @@ -1651,6 +1657,7 @@ FREEBUSY:20090512T190000Z/20090513T050000Z FREEBUSY:20090513T190000Z/20090514T050000Z FREEBUSY:20090513T194500Z/20090513T203000Z FREEBUSY:20090514T190000Z/20090515T050000Z +FREEBUSY:20090515T040000Z/20090515T070000Z FREEBUSY:20090517T190000Z/20090518T050000Z FREEBUSY:20090518T190000Z/20090519T050000Z FREEBUSY:20090518T194500Z/20090518T203000Z @@ -1688,6 +1695,7 @@ FREEBUSY:20090616T190000Z/20090617T050000Z FREEBUSY:20090617T190000Z/20090618T050000Z FREEBUSY:20090617T194500Z/20090617T203000Z FREEBUSY:20090618T190000Z/20090619T050000Z +FREEBUSY:20090619T040000Z/20090619T070000Z FREEBUSY:20090621T190000Z/20090622T050000Z FREEBUSY:20090622T190000Z/20090623T050000Z FREEBUSY:20090622T194500Z/20090622T203000Z @@ -1718,6 +1726,7 @@ FREEBUSY:20090714T190000Z/20090715T050000Z FREEBUSY:20090715T190000Z/20090716T050000Z FREEBUSY:20090715T194500Z/20090715T203000Z FREEBUSY:20090716T190000Z/20090717T050000Z +FREEBUSY:20090717T040000Z/20090717T070000Z FREEBUSY:20090719T190000Z/20090720T050000Z FREEBUSY:20090720T190000Z/20090721T050000Z FREEBUSY:20090720T194500Z/20090720T203000Z @@ -1755,6 +1764,7 @@ FREEBUSY:20090818T190000Z/20090819T050000Z FREEBUSY:20090819T190000Z/20090820T050000Z FREEBUSY:20090819T194500Z/20090819T203000Z FREEBUSY:20090820T190000Z/20090821T050000Z +FREEBUSY:20090821T040000Z/20090821T070000Z FREEBUSY:20090823T190000Z/20090824T050000Z FREEBUSY:20090824T190000Z/20090825T050000Z FREEBUSY:20090824T194500Z/20090824T203000Z @@ -1785,6 +1795,7 @@ FREEBUSY:20090915T190000Z/20090916T050000Z FREEBUSY:20090916T190000Z/20090917T050000Z FREEBUSY:20090916T194500Z/20090916T203000Z FREEBUSY:20090917T190000Z/20090918T050000Z +FREEBUSY:20090918T040000Z/20090918T070000Z FREEBUSY:20090920T190000Z/20090921T050000Z FREEBUSY:20090921T190000Z/20090922T050000Z FREEBUSY:20090921T194500Z/20090921T203000Z @@ -1816,6 +1827,7 @@ FREEBUSY:20091013T180000Z/20091014T040000Z FREEBUSY:20091014T180000Z/20091015T040000Z FREEBUSY:20091014T184500Z/20091014T193000Z FREEBUSY:20091015T180000Z/20091016T040000Z +FREEBUSY:20091016T030000Z/20091016T060000Z FREEBUSY:20091018T180000Z/20091019T040000Z FREEBUSY:20091019T180000Z/20091020T040000Z FREEBUSY:20091019T184500Z/20091019T193000Z @@ -1853,6 +1865,7 @@ FREEBUSY:20091117T180000Z/20091118T040000Z FREEBUSY:20091118T180000Z/20091119T040000Z FREEBUSY:20091118T184500Z/20091118T193000Z FREEBUSY:20091119T180000Z/20091120T040000Z +FREEBUSY:20091120T030000Z/20091120T060000Z FREEBUSY:20091122T180000Z/20091123T040000Z FREEBUSY:20091123T180000Z/20091124T040000Z FREEBUSY:20091123T184500Z/20091123T193000Z @@ -1883,6 +1896,7 @@ FREEBUSY:20091215T180000Z/20091216T040000Z FREEBUSY:20091216T180000Z/20091217T040000Z FREEBUSY:20091216T184500Z/20091216T193000Z FREEBUSY:20091217T180000Z/20091218T040000Z +FREEBUSY:20091218T030000Z/20091218T060000Z FREEBUSY:20091220T180000Z/20091221T040000Z FREEBUSY:20091221T180000Z/20091222T040000Z FREEBUSY:20091221T184500Z/20091221T193000Z @@ -1913,6 +1927,7 @@ FREEBUSY:20100112T180000Z/20100113T040000Z FREEBUSY:20100113T180000Z/20100114T040000Z FREEBUSY:20100113T184500Z/20100113T193000Z FREEBUSY:20100114T180000Z/20100115T040000Z +FREEBUSY:20100115T030000Z/20100115T060000Z FREEBUSY:20100117T180000Z/20100118T040000Z FREEBUSY:20100118T180000Z/20100119T040000Z FREEBUSY:20100118T184500Z/20100118T193000Z @@ -1950,6 +1965,7 @@ FREEBUSY:20100216T180000Z/20100217T040000Z FREEBUSY:20100217T180000Z/20100218T040000Z FREEBUSY:20100217T184500Z/20100217T193000Z FREEBUSY:20100218T180000Z/20100219T040000Z +FREEBUSY:20100219T030000Z/20100219T060000Z FREEBUSY:20100221T180000Z/20100222T040000Z FREEBUSY:20100222T180000Z/20100223T040000Z FREEBUSY:20100222T184500Z/20100222T193000Z @@ -1980,6 +1996,7 @@ FREEBUSY:20100316T180000Z/20100317T040000Z FREEBUSY:20100317T180000Z/20100318T040000Z FREEBUSY:20100317T184500Z/20100317T193000Z FREEBUSY:20100318T180000Z/20100319T040000Z +FREEBUSY:20100319T030000Z/20100319T060000Z FREEBUSY:20100321T180000Z/20100322T040000Z FREEBUSY:20100322T180000Z/20100323T040000Z FREEBUSY:20100322T184500Z/20100322T193000Z @@ -2010,6 +2027,7 @@ FREEBUSY:20100413T190000Z/20100414T050000Z FREEBUSY:20100414T190000Z/20100415T050000Z FREEBUSY:20100414T194500Z/20100414T203000Z FREEBUSY:20100415T190000Z/20100416T050000Z +FREEBUSY:20100416T040000Z/20100416T070000Z FREEBUSY:20100418T190000Z/20100419T050000Z FREEBUSY:20100419T190000Z/20100420T050000Z FREEBUSY:20100419T194500Z/20100419T203000Z @@ -2047,6 +2065,7 @@ FREEBUSY:20100518T190000Z/20100519T050000Z FREEBUSY:20100519T190000Z/20100520T050000Z FREEBUSY:20100519T194500Z/20100519T203000Z FREEBUSY:20100520T190000Z/20100521T050000Z +FREEBUSY:20100521T040000Z/20100521T070000Z FREEBUSY:20100523T190000Z/20100524T050000Z FREEBUSY:20100524T190000Z/20100525T050000Z FREEBUSY:20100524T194500Z/20100524T203000Z @@ -2077,6 +2096,7 @@ FREEBUSY:20100615T190000Z/20100616T050000Z FREEBUSY:20100616T190000Z/20100617T050000Z FREEBUSY:20100616T194500Z/20100616T203000Z FREEBUSY:20100617T190000Z/20100618T050000Z +FREEBUSY:20100618T040000Z/20100618T070000Z FREEBUSY:20100620T190000Z/20100621T050000Z FREEBUSY:20100621T190000Z/20100622T050000Z FREEBUSY:20100621T194500Z/20100621T203000Z @@ -2107,6 +2127,7 @@ FREEBUSY:20100713T190000Z/20100714T050000Z FREEBUSY:20100714T190000Z/20100715T050000Z FREEBUSY:20100714T194500Z/20100714T203000Z FREEBUSY:20100715T190000Z/20100716T050000Z +FREEBUSY:20100716T040000Z/20100716T070000Z FREEBUSY:20100718T190000Z/20100719T050000Z FREEBUSY:20100719T190000Z/20100720T050000Z FREEBUSY:20100719T194500Z/20100719T203000Z @@ -2144,6 +2165,7 @@ FREEBUSY:20100817T190000Z/20100818T050000Z FREEBUSY:20100818T190000Z/20100819T050000Z FREEBUSY:20100818T194500Z/20100818T203000Z FREEBUSY:20100819T190000Z/20100820T050000Z +FREEBUSY:20100820T040000Z/20100820T070000Z FREEBUSY:20100822T190000Z/20100823T050000Z FREEBUSY:20100823T190000Z/20100824T050000Z FREEBUSY:20100823T194500Z/20100823T203000Z @@ -2174,6 +2196,7 @@ FREEBUSY:20100914T190000Z/20100915T050000Z FREEBUSY:20100915T190000Z/20100916T050000Z FREEBUSY:20100915T194500Z/20100915T203000Z FREEBUSY:20100916T190000Z/20100917T050000Z +FREEBUSY:20100917T040000Z/20100917T070000Z FREEBUSY:20100919T190000Z/20100920T050000Z FREEBUSY:20100920T190000Z/20100921T050000Z FREEBUSY:20100920T194500Z/20100920T203000Z @@ -2204,6 +2227,7 @@ FREEBUSY:20101012T180000Z/20101013T040000Z FREEBUSY:20101013T180000Z/20101014T040000Z FREEBUSY:20101013T184500Z/20101013T193000Z FREEBUSY:20101014T180000Z/20101015T040000Z +FREEBUSY:20101015T030000Z/20101015T060000Z FREEBUSY:20101017T180000Z/20101018T040000Z FREEBUSY:20101018T180000Z/20101019T040000Z FREEBUSY:20101018T184500Z/20101018T193000Z diff --git a/testing/tests/regression-suite/0900-Moz-REPORT.result b/testing/tests/regression-suite/0900-Moz-REPORT.result index 89b31a2e..a8bff51d 100644 --- a/testing/tests/regression-suite/0900-Moz-REPORT.result +++ b/testing/tests/regression-suite/0900-Moz-REPORT.result @@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -ETag: "064d0dec288b53bef0f91734d355a42a" -Content-Length: 6389 +ETag: "6e587c714900b10e370ba52b9834bf90" +Content-Length: 6426 Content-Type: text/xml; charset="utf-8" @@ -214,6 +214,7 @@ END:DAYLIGHT END:VTIMEZONE BEGIN:VEVENT UID:71e2ae82-7870-11db-c6d6-f6927c144649 +DTSTAMP:20060511T043751Z DTSTART;TZID=Pacific/Auckland:20061103T160000 DTEND;TZID=Pacific/Auckland:20061103T174500 DESCRIPTION: @@ -232,20 +233,21 @@ END:VCALENDAR /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics - BEGIN:VCALENDAR -VERSION:2.0 -PRODID:-//PYVOBJECT//NONSGML Version 1//EN -BEGIN:VEVENT -UID:da81c0ee-7871-11db-c6d6-f6927c144649 -DTSTART:20061103T073000 -DTEND:20061103T093000 -DESCRIPTION: -LOCATION:Olivia's -RRULE:FREQ=MONTHLY -STATUS:CONFIRMED -SUMMARY:Morning Mgmt Mtg -END:VEVENT -END:VCALENDAR + BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//PYVOBJECT//NONSGML Version 1//EN +BEGIN:VEVENT +UID:da81c0ee-7871-11db-c6d6-f6927c144649 +DTSTAMP:20061024T115217Z +DTSTART:20061103T073000 +DTEND:20061103T093000 +DESCRIPTION: +LOCATION:Olivia's +RRULE:FREQ=MONTHLY +STATUS:CONFIRMED +SUMMARY:Morning Mgmt Mtg +END:VEVENT +END:VCALENDAR HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/0901-GET-Collection.result b/testing/tests/regression-suite/0901-GET-Collection.result index 7e658ab1..73c16a00 100644 --- a/testing/tests/regression-suite/0901-GET-Collection.result +++ b/testing/tests/regression-suite/0901-GET-Collection.result @@ -2,8 +2,8 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook -Content-Length: 10316 -Etag: "735679d819034badbcddd8aa6029bc3d" +Content-Length: 10383 +Etag: "855cbfab1940e342d7986c207bf3f973" Content-Type: text/calendar; charset="utf-8" BEGIN:VCALENDAR @@ -180,6 +180,7 @@ END:VALARM END:VTODO BEGIN:VEVENT UID:71e2ae82-7870-11db-c6d6-f6927c144649 +DTSTAMP:20060511T043751Z DTSTART;TZID=Pacific/Auckland:20061103T160000 DTEND;TZID=Pacific/Auckland:20061103T174500 DESCRIPTION: @@ -190,6 +191,7 @@ SUMMARY:Beer O'Clock END:VEVENT BEGIN:VEVENT UID:da81c0ee-7871-11db-c6d6-f6927c144649 +DTSTAMP:20061024T115217Z DTSTART:20061103T073000 DTEND:20061103T093000 DESCRIPTION: @@ -203,7 +205,7 @@ SEQUENCE:6 TRANSP:OPAQUE UID:AAA9318E-37D9-4319-8626-95ECD3D3B243 DTSTART;TZID=Pacific/Auckland:20071125T130000 -DTSTAMP:20071123T093223Z +DTSTAMP:20071124T224850Z SUMMARY:BBQ @ ML's CREATED:20071123T093048Z DTEND;TZID=Pacific/Auckland:20071125T190000 @@ -237,10 +239,11 @@ END:VEVENT BEGIN:VEVENT DESCRIPTION:Have a microparty. All the best parties are monthly! UID:MICROPARTY-77C6-4FB7-BDD3-6882E2F1BE74 -DTSTAMP:20081024T220925Z +DTSTAMP:20081027T074326Z SUMMARY:Woohoo! Time to Par-tay! CREATED:20081024T220749Z DTSTART;TZID=Pacific/Auckland:20081121T160000 +DURATION:PT3H RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=3FR END:VEVENT BEGIN:VTIMEZONE diff --git a/testing/tests/regression-suite/0924-MOVE-a.result b/testing/tests/regression-suite/0924-MOVE-a.result index d0abdc2c..1590a12c 100644 --- a/testing/tests/regression-suite/0924-MOVE-a.result +++ b/testing/tests/regression-suite/0924-MOVE-a.result @@ -12,5 +12,4 @@ Destination collection does not exist ci_user_no: >10< data_name: >/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< item_name: >/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< - mod_in_last_hour: >1< diff --git a/testing/tests/regression-suite/0924-MOVE-a.test b/testing/tests/regression-suite/0924-MOVE-a.test index 1b852a38..f6cf1256 100644 --- a/testing/tests/regression-suite/0924-MOVE-a.test +++ b/testing/tests/regression-suite/0924-MOVE-a.test @@ -9,7 +9,6 @@ HEAD QUERY SELECT caldav_data.dav_name AS data_name, calendar_item.dav_name AS item_name, - (modified > (current_timestamp - '1 hour'::interval)) AS mod_in_last_hour, caldav_data.user_no AS cd_user_no, calendar_item.user_no AS ci_user_no, caldav_data.collection_id AS cd_collection, diff --git a/testing/tests/regression-suite/0924-MOVE.result b/testing/tests/regression-suite/0924-MOVE.result index 308b8eac..29427979 100644 --- a/testing/tests/regression-suite/0924-MOVE.result +++ b/testing/tests/regression-suite/0924-MOVE.result @@ -12,5 +12,4 @@ Content-Type: text/plain; charset="utf-8" ci_user_no: >10< data_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< item_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< - mod_in_last_hour: >1< diff --git a/testing/tests/regression-suite/0924-MOVE.test b/testing/tests/regression-suite/0924-MOVE.test index 1496afa9..ba619f6f 100644 --- a/testing/tests/regression-suite/0924-MOVE.test +++ b/testing/tests/regression-suite/0924-MOVE.test @@ -9,7 +9,6 @@ HEAD QUERY SELECT caldav_data.dav_name AS data_name, calendar_item.dav_name AS item_name, - (modified > (current_timestamp - '1 hour'::interval)) AS mod_in_last_hour, caldav_data.user_no AS cd_user_no, calendar_item.user_no AS ci_user_no, caldav_data.collection_id AS cd_collection, diff --git a/testing/tests/regression-suite/0925-MOVE.result b/testing/tests/regression-suite/0925-MOVE.result index 3b69054c..65dce8a1 100644 --- a/testing/tests/regression-suite/0925-MOVE.result +++ b/testing/tests/regression-suite/0925-MOVE.result @@ -12,5 +12,4 @@ Content-Type: text/plain; charset="utf-8" ci_user_no: >10< data_name: >/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< item_name: >/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< - mod_in_last_hour: >1< diff --git a/testing/tests/regression-suite/0925-MOVE.test b/testing/tests/regression-suite/0925-MOVE.test index da6e47ac..cf24f54d 100644 --- a/testing/tests/regression-suite/0925-MOVE.test +++ b/testing/tests/regression-suite/0925-MOVE.test @@ -9,7 +9,6 @@ HEAD QUERY SELECT caldav_data.dav_name AS data_name, calendar_item.dav_name AS item_name, - (modified > (current_timestamp - '1 hour'::interval)) AS mod_in_last_hour, caldav_data.user_no AS cd_user_no, calendar_item.user_no AS ci_user_no, caldav_data.collection_id AS cd_collection, diff --git a/testing/tests/regression-suite/0926-MOVE.result b/testing/tests/regression-suite/0926-MOVE.result index 54db55d5..d7f34926 100644 --- a/testing/tests/regression-suite/0926-MOVE.result +++ b/testing/tests/regression-suite/0926-MOVE.result @@ -12,5 +12,4 @@ Content-Type: text/plain; charset="utf-8" ci_user_no: >100< data_name: >/resource1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< item_name: >/resource1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< - mod_in_last_hour: >1< diff --git a/testing/tests/regression-suite/0926-MOVE.test b/testing/tests/regression-suite/0926-MOVE.test index db6f424b..f476de80 100644 --- a/testing/tests/regression-suite/0926-MOVE.test +++ b/testing/tests/regression-suite/0926-MOVE.test @@ -10,7 +10,6 @@ HEAD QUERY SELECT caldav_data.dav_name AS data_name, calendar_item.dav_name AS item_name, - (modified > (current_timestamp - '1 hour'::interval)) AS mod_in_last_hour, caldav_data.user_no AS cd_user_no, calendar_item.user_no AS ci_user_no, caldav_data.collection_id AS cd_collection, diff --git a/testing/tests/regression-suite/0927-MOVE.result b/testing/tests/regression-suite/0927-MOVE.result index 3b69054c..65dce8a1 100644 --- a/testing/tests/regression-suite/0927-MOVE.result +++ b/testing/tests/regression-suite/0927-MOVE.result @@ -12,5 +12,4 @@ Content-Type: text/plain; charset="utf-8" ci_user_no: >10< data_name: >/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< item_name: >/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< - mod_in_last_hour: >1< diff --git a/testing/tests/regression-suite/0927-MOVE.test b/testing/tests/regression-suite/0927-MOVE.test index ed1ed8ed..86feada2 100644 --- a/testing/tests/regression-suite/0927-MOVE.test +++ b/testing/tests/regression-suite/0927-MOVE.test @@ -10,7 +10,6 @@ HEAD QUERY SELECT caldav_data.dav_name AS data_name, calendar_item.dav_name AS item_name, - (modified > (current_timestamp - '1 hour'::interval)) AS mod_in_last_hour, caldav_data.user_no AS cd_user_no, calendar_item.user_no AS ci_user_no, caldav_data.collection_id AS cd_collection,