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

Quick fix that allows validation with xmllint #178

Merged
merged 2 commits into from
Apr 13, 2022
Merged

Quick fix that allows validation with xmllint #178

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e51bc58
Quick fix that allows validation with xmllint
skinkie Dec 24, 2021
37b5706
Update xml.xsd
skinkie Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion OJP.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- ===Dependencies ======================================= -->
<xs:import namespace="http://www.vdv.de/ojp" schemaLocation="OJP_Requests.xsd"/>
<!-- ======================================================================= -->
<xs:include schemaLocation="siri/siri_base-v2.0.xsd"/>
<xs:include schemaLocation="siri/siri_all_framework-v2.0.xsd"/>
<!--== SIRI Request include OJP Requests ===================================================================== -->
<xs:element name="OJP">
<xs:annotation>
Expand Down
3 changes: 1 addition & 2 deletions OJP_Common.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<!-- edited with XMLSpy v2015 rel. 3 sp1 (x64) (http://www.altova.com) by Jutta Schmedding (Mentz Datenverarbeitung GmbH) -->
<xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
<!-- ===Dependencies ======================================= -->
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_reference-v2.0.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_operator_support-v2.0.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri/siri_all_framework-v2.0.xsd"/>
<!-- ===========================================================================================================-->
<xs:include schemaLocation="OJP_ModesSupport.xsd"/>
<xs:include schemaLocation="OJP_FacilitySupport.xsd"/>
Expand Down
2 changes: 1 addition & 1 deletion OJP_Fare.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- edited with XMLSpy v2007 sp2 (http://www.altova.com) by Werner Kohl (Mentz Datenverarbeitung GmbH) -->
<xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
<!-- ===Dependencies ======================================= -->
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_modes-v1.1.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri/siri_reference-v2.0.xsd"/>
<!-- ===========================================================================================================-->
<xs:include schemaLocation="OJP_Common.xsd"/>
<xs:include schemaLocation="OJP_FareSupport.xsd"/>
Expand Down
2 changes: 1 addition & 1 deletion OJP_ModesSupport.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- edited with XMLSpy v2015 rel. 3 sp1 (x64) (http://www.altova.com) by Jutta Schmedding (Mentz Datenverarbeitung GmbH) -->
<xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
<!-- ===Dependencies ======================================= -->
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_modes-v1.1.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri/siri_all_framework-v2.0.xsd"/>
<!-- ===========================================================================================================-->
<xs:include schemaLocation="OJP_Utility.xsd"/>
<xs:annotation>
Expand Down
2 changes: 1 addition & 1 deletion OJP_Requests.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Christophe Duquesne (Aurige) -->
<xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified" id="OJP_siri_service">
<!-- ===Dependencies ======================================= -->
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri/siri_requests-v2.0.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri/siri_all_framework-v2.0.xsd"/>
<!-- ===OJP Services ======================================= -->
<xs:include schemaLocation="OJP_Fare.xsd"/>
<xs:include schemaLocation="OJP_Locations.xsd"/>
Expand Down
2 changes: 1 addition & 1 deletion OJP_SituationSupport.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- edited with XMLSpy v2007 sp2 (http://www.altova.com) by Werner Kohl (Mentz Datenverarbeitung GmbH) -->
<xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri_model/siri_all_situation-v2.0.xsd"/>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="./siri/siri_all_framework-v2.0.xsd"/>
<xs:complexType name="SituationsStructure">
<xs:annotation>
<xs:documentation>Wrapper type for SIRI PtSituationsElementStructure</xs:documentation>
Expand Down
6 changes: 6 additions & 0 deletions siri/siri_all_framework-v2.0.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,10 @@
<xsd:include schemaLocation="siri_common_services-v2.0.xsd"/>
<xsd:include schemaLocation="siri_request_errorConditions-v2.0.xsd"/>
<xsd:include schemaLocation="siri_requests-v2.0.xsd"/>
<xsd:include schemaLocation="../siri_model/siri_modes-v1.1.xsd"/>
<xsd:include schemaLocation="../siri_model/siri_facilities-v1.2.xsd"/>
<xsd:include schemaLocation="../siri_model/siri_operator_support-v2.0.xsd"/>
<xsd:include schemaLocation="../siri_model/siri_reference-v2.0.xsd"/>
<xsd:include schemaLocation="../siri_model/siri_feature_support-v2.0.xsd"/>
<xsd:include schemaLocation="../siri_model/siri_situation-v2.0.xsd"/>
</xsd:schema>
160 changes: 160 additions & 0 deletions xml/xml.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
<?xml version="1.0"?>
skinkie marked this conversation as resolved.
Show resolved Hide resolved
<!-- DOCTYPE xsd:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" -->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.w3.org/XML/1998/namespace" xml:lang="en">
<xsd:attribute name="lang">
<xsd:simpleType>
<xsd:restriction base="xsd:language">
<xsd:enumeration value="AA"/>
<xsd:enumeration value="AB"/>
<xsd:enumeration value="AF"/>
<xsd:enumeration value="AM"/>
<xsd:enumeration value="AR"/>
<xsd:enumeration value="AS"/>
<xsd:enumeration value="AY"/>
<xsd:enumeration value="AZ"/>
<xsd:enumeration value="BA"/>
<xsd:enumeration value="BE"/>
<xsd:enumeration value="BG"/>
<xsd:enumeration value="BH"/>
<xsd:enumeration value="BI"/>
<xsd:enumeration value="BN"/>
<xsd:enumeration value="BO"/>
<xsd:enumeration value="BR"/>
<xsd:enumeration value="CA"/>
<xsd:enumeration value="CO"/>
<xsd:enumeration value="CS"/>
<xsd:enumeration value="CY"/>
<xsd:enumeration value="DA"/>
<xsd:enumeration value="DE"/>
<xsd:enumeration value="DZ"/>
<xsd:enumeration value="EL"/>
<xsd:enumeration value="EN"/>
<xsd:enumeration value="EO"/>
<xsd:enumeration value="ES"/>
<xsd:enumeration value="ET"/>
<xsd:enumeration value="EU"/>
<xsd:enumeration value="FA"/>
<xsd:enumeration value="FI"/>
<xsd:enumeration value="FJ"/>
<xsd:enumeration value="FO"/>
<xsd:enumeration value="FR"/>
<xsd:enumeration value="FY"/>
<xsd:enumeration value="GA"/>
<xsd:enumeration value="GD"/>
<xsd:enumeration value="GL"/>
<xsd:enumeration value="GN"/>
<xsd:enumeration value="GU"/>
<xsd:enumeration value="HA"/>
<xsd:enumeration value="HI"/>
<xsd:enumeration value="HR"/>
<xsd:enumeration value="HU"/>
<xsd:enumeration value="HY"/>
<xsd:enumeration value="IA"/>
<xsd:enumeration value="IE"/>
<xsd:enumeration value="IK"/>
<xsd:enumeration value="IN"/>
<xsd:enumeration value="IS"/>
<xsd:enumeration value="IT"/>
<xsd:enumeration value="IW"/>
<xsd:enumeration value="JA"/>
<xsd:enumeration value="JI"/>
<xsd:enumeration value="JW"/>
<xsd:enumeration value="KA"/>
<xsd:enumeration value="KK"/>
<xsd:enumeration value="KL"/>
<xsd:enumeration value="KM"/>
<xsd:enumeration value="KN"/>
<xsd:enumeration value="KO"/>
<xsd:enumeration value="KS"/>
<xsd:enumeration value="KU"/>
<xsd:enumeration value="KY"/>
<xsd:enumeration value="LA"/>
<xsd:enumeration value="LN"/>
<xsd:enumeration value="LO"/>
<xsd:enumeration value="LT"/>
<xsd:enumeration value="LV"/>
<xsd:enumeration value="MG"/>
<xsd:enumeration value="MI"/>
<xsd:enumeration value="MK"/>
<xsd:enumeration value="ML"/>
<xsd:enumeration value="MN"/>
<xsd:enumeration value="MO"/>
<xsd:enumeration value="MR"/>
<xsd:enumeration value="MS"/>
<xsd:enumeration value="MT"/>
<xsd:enumeration value="MY"/>
<xsd:enumeration value="NA"/>
<xsd:enumeration value="NE"/>
<xsd:enumeration value="NL"/>
<xsd:enumeration value="NO"/>
<xsd:enumeration value="OC"/>
<xsd:enumeration value="OM"/>
<xsd:enumeration value="OR"/>
<xsd:enumeration value="PA"/>
<xsd:enumeration value="PL"/>
<xsd:enumeration value="PS"/>
<xsd:enumeration value="PT"/>
<xsd:enumeration value="QU"/>
<xsd:enumeration value="RM"/>
<xsd:enumeration value="RN"/>
<xsd:enumeration value="RO"/>
<xsd:enumeration value="RU"/>
<xsd:enumeration value="RW"/>
<xsd:enumeration value="SA"/>
<xsd:enumeration value="SD"/>
<xsd:enumeration value="SG"/>
<xsd:enumeration value="SH"/>
<xsd:enumeration value="SI"/>
<xsd:enumeration value="SK"/>
<xsd:enumeration value="SL"/>
<xsd:enumeration value="SM"/>
<xsd:enumeration value="SN"/>
<xsd:enumeration value="SO"/>
<xsd:enumeration value="SQ"/>
<xsd:enumeration value="SR"/>
<xsd:enumeration value="SS"/>
<xsd:enumeration value="ST"/>
<xsd:enumeration value="SU"/>
<xsd:enumeration value="SV"/>
<xsd:enumeration value="SW"/>
<xsd:enumeration value="TA"/>
<xsd:enumeration value="TE"/>
<xsd:enumeration value="TG"/>
<xsd:enumeration value="TH"/>
<xsd:enumeration value="TI"/>
<xsd:enumeration value="TK"/>
<xsd:enumeration value="TL"/>
<xsd:enumeration value="TN"/>
<xsd:enumeration value="TO"/>
<xsd:enumeration value="TR"/>
<xsd:enumeration value="TS"/>
<xsd:enumeration value="TT"/>
<xsd:enumeration value="TW"/>
<xsd:enumeration value="UK"/>
<xsd:enumeration value="UR"/>
<xsd:enumeration value="UZ"/>
<xsd:enumeration value="VI"/>
<xsd:enumeration value="VO"/>
<xsd:enumeration value="WO"/>
<xsd:enumeration value="XH"/>
<xsd:enumeration value="YO"/>
<xsd:enumeration value="ZH"/>
<xsd:enumeration value="ZU"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="space" default="preserve">
<xsd:simpleType>
<xsd:restriction base="xsd:NCName">
<xsd:enumeration value="default"/>
<xsd:enumeration value="preserve"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="base" type="xsd:anyURI"/>
<xsd:attributeGroup name="specialAttrs">
<xsd:attribute ref="xml:base"/>
<xsd:attribute ref="xml:lang"/>
<xsd:attribute ref="xml:space"/>
</xsd:attributeGroup>
</xsd:schema>