Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modified general format to have calendarTimeZone="" not UTC. #105

Merged
merged 1 commit into from
Aug 16, 2018
Merged

Modified general format to have calendarTimeZone="" not UTC. #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion daffodil-lib/src/main/resources/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
calendarLanguage="en"
calendarObserveDST="yes"
calendarPatternKind="implicit"
calendarTimeZone="UTC"
calendarTimeZone=""
decimalSigned="yes"
documentFinalTerminatorCanBeMissing="no"
emptyValueDelimiterPolicy="both"
Expand Down
2 changes: 1 addition & 1 deletion ...l-test/src/test/resources/org/apache/daffodil/section02/validation_errors/Validation.tdml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@
<tdml:document><![CDATA[2014-03-24T03:45:30]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
<dateTimeImp>2014-03-24T03:45:30.000000+00:00</dateTimeImp>
<dateTimeImp>2014-03-24T03:45:30.000000</dateTimeImp>
</tdml:dfdlInfoset>
</tdml:infoset>
<tdml:validationErrors>
Expand Down
12 changes: 6 additions & 6 deletions daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/Facets.tdml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4808,7 +4808,7 @@
<tdml:document><![CDATA[2013-03-24T03:45:30]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
<dateTimeImp>2013-03-24T03:45:30.000000+00:00</dateTimeImp>
<dateTimeImp>2013-03-24T03:45:30.000000</dateTimeImp>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
Expand Down Expand Up @@ -4967,8 +4967,8 @@
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:date">
<xs:enumeration value="2013-02-15+00:00" />
<xs:enumeration value="1988-03-24+00:00" />
<xs:enumeration value="2013-02-15" />
<xs:enumeration value="1988-03-24" />
</xs:restriction>
</xs:simpleType>
</xs:element>
Expand Down Expand Up @@ -5192,7 +5192,7 @@
<tdml:document>Month March, day 24, year 1988</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
<enum_e7>1988-03-24+00:00</enum_e7>
<enum_e7>1988-03-24</enum_e7>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
Expand Down Expand Up @@ -6154,7 +6154,7 @@
<tdml:document>Today is the 16th day of March, year 2012</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
<mImE_e13>2012-03-16+00:00</mImE_e13>
<mImE_e13>2012-03-16</mImE_e13>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
Expand Down Expand Up @@ -6202,7 +6202,7 @@
<tdml:document>11:00:00</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
<mImE_e14>11:00:00.000000+00:00</mImE_e14>
<mImE_e14>11:00:00.000000</mImE_e14>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
Expand Down
8 changes: 4 additions & 4 deletions ...rc/test/resources/org/apache/daffodil/section05/simple_types/RuntimeCalendarLanguage.tdml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<r>
<lang>de</lang>
<variant>1996</variant>
<date>2013-03-01+00:00</date>
<date>2013-03-01</date>
</r>
</tdml:dfdlInfoset>
</tdml:infoset>
Expand Down Expand Up @@ -112,7 +112,7 @@
<tns:r>
<lang>de</lang>
<variant>1996</variant>
<date>2013-03-01+00:00</date>
<date>2013-03-01</date>
<dateString>2013-03-01</dateString>
</tns:r>
</tdml:dfdlInfoset>
Expand Down Expand Up @@ -176,10 +176,10 @@
<tns:r>
<lang>de</lang>
<variant>1996</variant>
<date>2013-03-01+00:00</date>
<date>2013-03-01</date>
<lang2>en</lang2>
<variant2>us</variant2>
<date2>2013-03-01+00:00</date2>
<date2>2013-03-01</date2>
<dateString>2013-03-01</dateString>
</tns:r>
</tdml:dfdlInfoset>
Expand Down