Repository: any23 Updated Branches: refs/heads/master 3e949f268 -> d570ababb
Use ical:dateTime for floating date-time values, as in fromIcal.py Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/d570abab Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/d570abab Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/d570abab Branch: refs/heads/master Commit: d570ababb562927bb29affd89e197659736009d2 Parents: 3e949f2 Author: Hans <[email protected]> Authored: Wed Aug 29 11:55:07 2018 -0500 Committer: Hans <[email protected]> Committed: Wed Aug 29 11:55:07 2018 -0500 ---------------------------------------------------------------------- api/src/main/java/org/apache/any23/vocab/ICAL.java | 5 +++++ .../extractor/calendar/BaseCalendarExtractor.java | 15 +++++++++++---- .../calendar.json/rfc7265-example2-expected.nquads | 4 ++-- .../example2-bad-timezone-expected.nquads | 8 ++++---- .../example2-external-timezone-expected.nquads | 4 ++-- .../calendar.text/rfc5545-example2-expected.nquads | 4 ++-- .../calendar.text/rfc5545-example4-expected.nquads | 2 +- .../calendar.xml/rfc6321-example2-expected.nquads | 4 ++-- 8 files changed, 29 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/d570abab/api/src/main/java/org/apache/any23/vocab/ICAL.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/any23/vocab/ICAL.java b/api/src/main/java/org/apache/any23/vocab/ICAL.java index 81bae3f..ce5c559 100644 --- a/api/src/main/java/org/apache/any23/vocab/ICAL.java +++ b/api/src/main/java/org/apache/any23/vocab/ICAL.java @@ -61,6 +61,11 @@ public class ICAL extends Vocabulary { public final IRI Value_DATE_TIME = createClass("Value_DATE-TIME"); + /** + * ICAL datatype for floating date-time values + */ + public final IRI DATE_TIME = createIRI(NS + "dateTime"); + public final IRI Value_DURATION = createClass("Value_DURATION"); public final IRI Value_PERIOD = createClass("Value_PERIOD"); http://git-wip-us.apache.org/repos/asf/any23/blob/d570abab/core/src/main/java/org/apache/any23/extractor/calendar/BaseCalendarExtractor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/any23/extractor/calendar/BaseCalendarExtractor.java b/core/src/main/java/org/apache/any23/extractor/calendar/BaseCalendarExtractor.java index 7be350e..e0c5559 100644 --- a/core/src/main/java/org/apache/any23/extractor/calendar/BaseCalendarExtractor.java +++ b/core/src/main/java/org/apache/any23/extractor/calendar/BaseCalendarExtractor.java @@ -216,7 +216,7 @@ abstract class BaseCalendarExtractor implements Extractor.ContentExtractor { } - private static IRI dataType(ICalDataType dataType) { + private static IRI dataType(ICalDataType dataType, Boolean isFloating) { if (dataType == null || ICalDataType.TEXT.equals(dataType)) { return XMLSchema.STRING; } else if (ICalDataType.BOOLEAN.equals(dataType)) { @@ -233,7 +233,10 @@ abstract class BaseCalendarExtractor implements Extractor.ContentExtractor { || ICalDataType.CAL_ADDRESS.equals(dataType)) { return XMLSchema.ANYURI; } else if (ICalDataType.DATE_TIME.equals(dataType)) { - return XMLSchema.DATETIME; + if (isFloating == null) { + return null; + } + return isFloating ? vICAL.DATE_TIME : XMLSchema.DATETIME; } else if (ICalDataType.DATE.equals(dataType)) { return XMLSchema.DATE; } else if (ICalDataType.TIME.equals(dataType)) { @@ -466,9 +469,10 @@ abstract class BaseCalendarExtractor implements Extractor.ContentExtractor { } else { String tzId = params.getTimezoneId(); + TimezoneInfo tzInfo = ctx.getTimezoneInfo(); TimeZone timeZone = null; + Boolean floating; if (tzId != null) { - TimezoneInfo tzInfo = ctx.getTimezoneInfo(); TimezoneAssignment assign = tzInfo.getTimezone(prop); if (assign != null) { timeZone = assign.getTimeZone(); @@ -476,9 +480,12 @@ abstract class BaseCalendarExtractor implements Extractor.ContentExtractor { timeZone = parseTimeZoneId(tzId); tzInfo.setFloating(prop, true); } + floating = timeZone == null ? null : Boolean.FALSE; + } else { + floating = tzInfo.isFloating(prop); } - IRI dataTypeIRI = dataType(dataType); + IRI dataTypeIRI = dataType(dataType, floating); JCalValue jsonVal = scribe.writeJson(prop, ctx); List<JsonValue> jsonVals = jsonVal.getValues(); http://git-wip-us.apache.org/repos/asf/any23/blob/d570abab/test-resources/src/test/resources/calendar.json/rfc7265-example2-expected.nquads ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/calendar.json/rfc7265-example2-expected.nquads b/test-resources/src/test/resources/calendar.json/rfc7265-example2-expected.nquads index 12d26bb..77f6c8c 100644 --- a/test-resources/src/test/resources/calendar.json/rfc7265-example2-expected.nquads +++ b/test-resources/src/test/resources/calendar.json/rfc7265-example2-expected.nquads @@ -22,7 +22,7 @@ _:node1clu415j2x3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www. _:node1clu415j2x3 <http://www.w3.org/2002/12/cal/icaltzd#tzid> "US/Eastern" <http://bob.example.com/> . _:node1clu415j2x3 <http://www.w3.org/2002/12/cal/icaltzd#lastModified> "2004-01-10T03:28:45Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> <http://bob.example.com/> . _:node1clu415j2x3 <http://www.w3.org/2002/12/cal/icaltzd#daylight> _:node1clu415j2x4 <http://bob.example.com/> . -_:node1clu415j2x4 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "2000-04-04T02:00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> <http://bob.example.com/> . +_:node1clu415j2x4 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "2000-04-04T02:00:00"^^<http://www.w3.org/2002/12/cal/icaltzd#dateTime> <http://bob.example.com/> . _:node1clu415j2x4 <http://www.w3.org/2002/12/cal/icaltzd#rrule> _:node1clu415j2x5 <http://bob.example.com/> . _:node1clu415j2x5 <http://www.w3.org/2002/12/cal/icaltzd#freq> "YEARLY" <http://bob.example.com/> . _:node1clu415j2x5 <http://www.w3.org/2002/12/cal/icaltzd#byday> "1SU" <http://bob.example.com/> . @@ -31,7 +31,7 @@ _:node1clu415j2x4 <http://www.w3.org/2002/12/cal/icaltzd#tzname> "EDT" <http://b _:node1clu415j2x4 <http://www.w3.org/2002/12/cal/icaltzd#tzoffsetfrom> "-05:00" <http://bob.example.com/> . _:node1clu415j2x4 <http://www.w3.org/2002/12/cal/icaltzd#tzoffsetto> "-04:00" <http://bob.example.com/> . _:node1clu415j2x3 <http://www.w3.org/2002/12/cal/icaltzd#standard> _:node1clu415j2x6 <http://bob.example.com/> . -_:node1clu415j2x6 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "2000-10-26T02:00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> <http://bob.example.com/> . +_:node1clu415j2x6 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "2000-10-26T02:00:00"^^<http://www.w3.org/2002/12/cal/icaltzd#dateTime> <http://bob.example.com/> . _:node1clu415j2x6 <http://www.w3.org/2002/12/cal/icaltzd#rrule> _:node1clu415j2x7 <http://bob.example.com/> . _:node1clu415j2x7 <http://www.w3.org/2002/12/cal/icaltzd#freq> "YEARLY" <http://bob.example.com/> . _:node1clu415j2x7 <http://www.w3.org/2002/12/cal/icaltzd#byday> "1SU" <http://bob.example.com/> . http://git-wip-us.apache.org/repos/asf/any23/blob/d570abab/test-resources/src/test/resources/calendar.text/example2-bad-timezone-expected.nquads ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/calendar.text/example2-bad-timezone-expected.nquads b/test-resources/src/test/resources/calendar.text/example2-bad-timezone-expected.nquads index b9b5d73..fc024d8 100644 --- a/test-resources/src/test/resources/calendar.text/example2-bad-timezone-expected.nquads +++ b/test-resources/src/test/resources/calendar.text/example2-bad-timezone-expected.nquads @@ -21,12 +21,12 @@ _:node1clu1u3ipx2 <http://www.w3.org/2002/12/cal/icaltzd#component> _:node1clu1u _:node1clu1u3ipx3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/12/cal/icaltzd#Vtimezone> <http://bob.example.com/> . _:node1clu1u3ipx3 <http://www.w3.org/2002/12/cal/icaltzd#tzid> "America/New_York" <http://bob.example.com/> . _:node1clu1u3ipx3 <http://www.w3.org/2002/12/cal/icaltzd#standard> _:node1clu1u3ipx4 <http://bob.example.com/> . -_:node1clu1u3ipx4 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "1998-10-25T02:00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> <http://bob.example.com/> . +_:node1clu1u3ipx4 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "1998-10-25T02:00:00"^^<http://www.w3.org/2002/12/cal/icaltzd#dateTime> <http://bob.example.com/> . _:node1clu1u3ipx4 <http://www.w3.org/2002/12/cal/icaltzd#tzoffsetfrom> "-04:00" <http://bob.example.com/> . _:node1clu1u3ipx4 <http://www.w3.org/2002/12/cal/icaltzd#tzoffsetto> "-05:00" <http://bob.example.com/> . _:node1clu1u3ipx4 <http://www.w3.org/2002/12/cal/icaltzd#tzname> "EST" <http://bob.example.com/> . _:node1clu1u3ipx3 <http://www.w3.org/2002/12/cal/icaltzd#daylight> _:node1clu1u3ipx5 <http://bob.example.com/> . -_:node1clu1u3ipx5 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "1999-04-04T02:00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> <http://bob.example.com/> . +_:node1clu1u3ipx5 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "1999-04-04T02:00:00"^^<http://www.w3.org/2002/12/cal/icaltzd#dateTime> <http://bob.example.com/> . _:node1clu1u3ipx5 <http://www.w3.org/2002/12/cal/icaltzd#tzoffsetfrom> "-05:00" <http://bob.example.com/> . _:node1clu1u3ipx5 <http://www.w3.org/2002/12/cal/icaltzd#tzoffsetto> "-04:00" <http://bob.example.com/> . _:node1clu1u3ipx5 <http://www.w3.org/2002/12/cal/icaltzd#tzname> "EDT" <http://bob.example.com/> . @@ -48,9 +48,9 @@ _:node1clu1u3ipx6 <http://www.w3.org/2002/12/cal/icaltzd#created> "1998-03-09T13 _:node1clu1u3ipx6 <http://www.w3.org/2002/12/cal/icaltzd#summary> "XYZ Project Review" <http://bob.example.com/> . _:node1clu1u3ipx6 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> _:node1clu1u3ipx8 <http://bob.example.com/> . _:node1clu1u3ipx8 <http://www.w3.org/2002/12/cal/icaltzd#tzid> "America/New_Yor" <http://bob.example.com/> . -_:node1clu1u3ipx8 <http://www.w3.org/1999/02/22-rdf-syntax-ns#value> "1998-03-12T08:30:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> <http://bob.example.com/> . +_:node1clu1u3ipx8 <http://www.w3.org/1999/02/22-rdf-syntax-ns#value> "1998-03-12T08:30:00" <http://bob.example.com/> . _:node1clu1u3ipx6 <http://www.w3.org/2002/12/cal/icaltzd#dtend> _:node1clu1u3ipx9 <http://bob.example.com/> . _:node1clu1u3ipx9 <http://www.w3.org/2002/12/cal/icaltzd#tzid> "America/New_Yor" <http://bob.example.com/> . -_:node1clu1u3ipx9 <http://www.w3.org/1999/02/22-rdf-syntax-ns#value> "1998-03-12T09:30:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> <http://bob.example.com/> . +_:node1clu1u3ipx9 <http://www.w3.org/1999/02/22-rdf-syntax-ns#value> "1998-03-12T09:30:00" <http://bob.example.com/> . _:node1clu1u3ipx6 <http://www.w3.org/2002/12/cal/icaltzd#location> "1CP Conference Room 4350" <http://bob.example.com/> . http://git-wip-us.apache.org/repos/asf/any23/blob/d570abab/test-resources/src/test/resources/calendar.text/example2-external-timezone-expected.nquads ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/calendar.text/example2-external-timezone-expected.nquads b/test-resources/src/test/resources/calendar.text/example2-external-timezone-expected.nquads index 03aa3ff..9002cdb 100644 --- a/test-resources/src/test/resources/calendar.text/example2-external-timezone-expected.nquads +++ b/test-resources/src/test/resources/calendar.text/example2-external-timezone-expected.nquads @@ -21,12 +21,12 @@ _:node1clu1u3ipx2 <http://www.w3.org/2002/12/cal/icaltzd#component> _:node1clu1u _:node1clu1u3ipx3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/12/cal/icaltzd#Vtimezone> <http://bob.example.com/> . _:node1clu1u3ipx3 <http://www.w3.org/2002/12/cal/icaltzd#tzid> "America/New_York" <http://bob.example.com/> . _:node1clu1u3ipx3 <http://www.w3.org/2002/12/cal/icaltzd#standard> _:node1clu1u3ipx4 <http://bob.example.com/> . -_:node1clu1u3ipx4 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "1998-10-25T02:00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> <http://bob.example.com/> . +_:node1clu1u3ipx4 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "1998-10-25T02:00:00"^^<http://www.w3.org/2002/12/cal/icaltzd#dateTime> <http://bob.example.com/> . _:node1clu1u3ipx4 <http://www.w3.org/2002/12/cal/icaltzd#tzoffsetfrom> "-02:00" <http://bob.example.com/> . _:node1clu1u3ipx4 <http://www.w3.org/2002/12/cal/icaltzd#tzoffsetto> "-03:00" <http://bob.example.com/> . _:node1clu1u3ipx4 <http://www.w3.org/2002/12/cal/icaltzd#tzname> "EST" <http://bob.example.com/> . _:node1clu1u3ipx3 <http://www.w3.org/2002/12/cal/icaltzd#daylight> _:node1clu1u3ipx5 <http://bob.example.com/> . -_:node1clu1u3ipx5 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "1999-04-04T02:00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> <http://bob.example.com/> . +_:node1clu1u3ipx5 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "1999-04-04T02:00:00"^^<http://www.w3.org/2002/12/cal/icaltzd#dateTime> <http://bob.example.com/> . _:node1clu1u3ipx5 <http://www.w3.org/2002/12/cal/icaltzd#tzoffsetfrom> "-03:00" <http://bob.example.com/> . _:node1clu1u3ipx5 <http://www.w3.org/2002/12/cal/icaltzd#tzoffsetto> "-02:00" <http://bob.example.com/> . _:node1clu1u3ipx5 <http://www.w3.org/2002/12/cal/icaltzd#tzname> "EDT" <http://bob.example.com/> . http://git-wip-us.apache.org/repos/asf/any23/blob/d570abab/test-resources/src/test/resources/calendar.text/rfc5545-example2-expected.nquads ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/calendar.text/rfc5545-example2-expected.nquads b/test-resources/src/test/resources/calendar.text/rfc5545-example2-expected.nquads index 389f86c..fce9cd9 100644 --- a/test-resources/src/test/resources/calendar.text/rfc5545-example2-expected.nquads +++ b/test-resources/src/test/resources/calendar.text/rfc5545-example2-expected.nquads @@ -21,12 +21,12 @@ _:node1clu1u3ipx2 <http://www.w3.org/2002/12/cal/icaltzd#component> _:node1clu1u _:node1clu1u3ipx3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/12/cal/icaltzd#Vtimezone> <http://bob.example.com/> . _:node1clu1u3ipx3 <http://www.w3.org/2002/12/cal/icaltzd#tzid> "America/New_York" <http://bob.example.com/> . _:node1clu1u3ipx3 <http://www.w3.org/2002/12/cal/icaltzd#standard> _:node1clu1u3ipx4 <http://bob.example.com/> . -_:node1clu1u3ipx4 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "1998-10-25T02:00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> <http://bob.example.com/> . +_:node1clu1u3ipx4 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "1998-10-25T02:00:00"^^<http://www.w3.org/2002/12/cal/icaltzd#dateTime> <http://bob.example.com/> . _:node1clu1u3ipx4 <http://www.w3.org/2002/12/cal/icaltzd#tzoffsetfrom> "-04:00" <http://bob.example.com/> . _:node1clu1u3ipx4 <http://www.w3.org/2002/12/cal/icaltzd#tzoffsetto> "-05:00" <http://bob.example.com/> . _:node1clu1u3ipx4 <http://www.w3.org/2002/12/cal/icaltzd#tzname> "EST" <http://bob.example.com/> . _:node1clu1u3ipx3 <http://www.w3.org/2002/12/cal/icaltzd#daylight> _:node1clu1u3ipx5 <http://bob.example.com/> . -_:node1clu1u3ipx5 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "1999-04-04T02:00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> <http://bob.example.com/> . +_:node1clu1u3ipx5 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "1999-04-04T02:00:00"^^<http://www.w3.org/2002/12/cal/icaltzd#dateTime> <http://bob.example.com/> . _:node1clu1u3ipx5 <http://www.w3.org/2002/12/cal/icaltzd#tzoffsetfrom> "-05:00" <http://bob.example.com/> . _:node1clu1u3ipx5 <http://www.w3.org/2002/12/cal/icaltzd#tzoffsetto> "-04:00" <http://bob.example.com/> . _:node1clu1u3ipx5 <http://www.w3.org/2002/12/cal/icaltzd#tzname> "EDT" <http://bob.example.com/> . http://git-wip-us.apache.org/repos/asf/any23/blob/d570abab/test-resources/src/test/resources/calendar.text/rfc5545-example4-expected.nquads ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/calendar.text/rfc5545-example4-expected.nquads b/test-resources/src/test/resources/calendar.text/rfc5545-example4-expected.nquads index 351a6b3..3fe4510 100644 --- a/test-resources/src/test/resources/calendar.text/rfc5545-example4-expected.nquads +++ b/test-resources/src/test/resources/calendar.text/rfc5545-example4-expected.nquads @@ -27,7 +27,7 @@ _:node1clu27ji5x7 <http://www.w3.org/2002/12/cal/icaltzd#calAddress> <mailto:unc _:node1clu27ji5x3 <http://www.w3.org/2002/12/cal/icaltzd#attendee> _:node1clu27ji5x4 <http://bob.example.com/> . _:node1clu27ji5x4 <http://www.w3.org/2002/12/cal/icaltzd#partstat> "ACCEPTED" <http://bob.example.com/> . _:node1clu27ji5x4 <http://www.w3.org/2002/12/cal/icaltzd#calAddress> <mailto:[email protected]> <http://bob.example.com/> . -_:node1clu27ji5x3 <http://www.w3.org/2002/12/cal/icaltzd#due> "1998-04-15T00:00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> <http://bob.example.com/> . +_:node1clu27ji5x3 <http://www.w3.org/2002/12/cal/icaltzd#due> "1998-04-15T00:00:00"^^<http://www.w3.org/2002/12/cal/icaltzd#dateTime> <http://bob.example.com/> . _:node1clu27ji5x3 <http://www.w3.org/2002/12/cal/icaltzd#status> "NEEDS-ACTION" <http://bob.example.com/> . _:node1clu27ji5x3 <http://www.w3.org/2002/12/cal/icaltzd#summary> "Submit Income Taxes" <http://bob.example.com/> . _:node1clu27ji5x3 <http://www.w3.org/2002/12/cal/icaltzd#component> _:node1clu27ji5x5 <http://bob.example.com/> . http://git-wip-us.apache.org/repos/asf/any23/blob/d570abab/test-resources/src/test/resources/calendar.xml/rfc6321-example2-expected.nquads ---------------------------------------------------------------------- diff --git a/test-resources/src/test/resources/calendar.xml/rfc6321-example2-expected.nquads b/test-resources/src/test/resources/calendar.xml/rfc6321-example2-expected.nquads index b89c659..1cde7e5 100644 --- a/test-resources/src/test/resources/calendar.xml/rfc6321-example2-expected.nquads +++ b/test-resources/src/test/resources/calendar.xml/rfc6321-example2-expected.nquads @@ -22,7 +22,7 @@ _:node1clu4e12ox3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www. _:node1clu4e12ox3 <http://www.w3.org/2002/12/cal/icaltzd#lastModified> "2004-01-10T03:28:45Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> <http://bob.example.com/> . _:node1clu4e12ox3 <http://www.w3.org/2002/12/cal/icaltzd#tzid> "US/Eastern" <http://bob.example.com/> . _:node1clu4e12ox3 <http://www.w3.org/2002/12/cal/icaltzd#daylight> _:node1clu4e12ox4 <http://bob.example.com/> . -_:node1clu4e12ox4 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "2000-04-04T02:00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> <http://bob.example.com/> . +_:node1clu4e12ox4 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "2000-04-04T02:00:00"^^<http://www.w3.org/2002/12/cal/icaltzd#dateTime> <http://bob.example.com/> . _:node1clu4e12ox4 <http://www.w3.org/2002/12/cal/icaltzd#rrule> _:node1clu4e12ox5 <http://bob.example.com/> . _:node1clu4e12ox5 <http://www.w3.org/2002/12/cal/icaltzd#freq> "YEARLY" <http://bob.example.com/> . _:node1clu4e12ox5 <http://www.w3.org/2002/12/cal/icaltzd#byday> "1SU" <http://bob.example.com/> . @@ -31,7 +31,7 @@ _:node1clu4e12ox4 <http://www.w3.org/2002/12/cal/icaltzd#tzname> "EDT" <http://b _:node1clu4e12ox4 <http://www.w3.org/2002/12/cal/icaltzd#tzoffsetfrom> "-05:00" <http://bob.example.com/> . _:node1clu4e12ox4 <http://www.w3.org/2002/12/cal/icaltzd#tzoffsetto> "-04:00" <http://bob.example.com/> . _:node1clu4e12ox3 <http://www.w3.org/2002/12/cal/icaltzd#standard> _:node1clu4e12ox6 <http://bob.example.com/> . -_:node1clu4e12ox6 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "2000-10-26T02:00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> <http://bob.example.com/> . +_:node1clu4e12ox6 <http://www.w3.org/2002/12/cal/icaltzd#dtstart> "2000-10-26T02:00:00"^^<http://www.w3.org/2002/12/cal/icaltzd#dateTime> <http://bob.example.com/> . _:node1clu4e12ox6 <http://www.w3.org/2002/12/cal/icaltzd#rrule> _:node1clu4e12ox7 <http://bob.example.com/> . _:node1clu4e12ox7 <http://www.w3.org/2002/12/cal/icaltzd#freq> "YEARLY" <http://bob.example.com/> . _:node1clu4e12ox7 <http://www.w3.org/2002/12/cal/icaltzd#byday> "-1SU" <http://bob.example.com/> .
