From 00c55498eedfde690a864aee5af799c58baaff17 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Sat, 4 Nov 2023 21:02:00 +0100 Subject: [PATCH 1/8] Fix EPIAP example I got the following error due versionRef between some elements were different. In my perspective this might actually show an actual bug. For now I resolve it. element OperatorRef: Schemas validity error : Element '{http://www.netex.org.uk/netex}OperatorRef', attribute 'ref': The XPath '@ref' of a field of keyref identity-constraint '{http://www.netex.org.uk/netex}Operator_KeyRef' evaluates to a node-set with more than one member. --- .../fares/ENTUR-SchoolTwiceADayTripCarnet_2020120.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/functions/fares/ENTUR-SchoolTwiceADayTripCarnet_2020120.xml b/examples/functions/fares/ENTUR-SchoolTwiceADayTripCarnet_2020120.xml index 9b2616ba7..545bfac69 100644 --- a/examples/functions/fares/ENTUR-SchoolTwiceADayTripCarnet_2020120.xml +++ b/examples/functions/fares/ENTUR-SchoolTwiceADayTripCarnet_2020120.xml @@ -200,7 +200,7 @@ School transport with limited number of rides beforeTravel - + @@ -396,7 +396,7 @@ - + @@ -411,7 +411,7 @@ - + @@ -440,7 +440,7 @@ - + @@ -455,7 +455,7 @@ - + From dc030fd7117e8e66937f83c10dca6d741982be3f Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Sat, 4 Nov 2023 21:04:47 +0100 Subject: [PATCH 2/8] Make sure the EPIAP examples actually get validated --- .github/scripts/validate-examples.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/validate-examples.sh b/.github/scripts/validate-examples.sh index 45041a37a..cbde12057 100755 --- a/.github/scripts/validate-examples.sh +++ b/.github/scripts/validate-examples.sh @@ -9,7 +9,7 @@ set -e echo "Validating NeTEx XML examples ..." -if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then +if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m' else echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m' From 098e84cc22ce667824f747aac22b284f76353b6f Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Sat, 4 Nov 2023 21:45:08 +0100 Subject: [PATCH 3/8] fix script again --- .github/scripts/validate-examples.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/validate-examples.sh b/.github/scripts/validate-examples.sh index cbde12057..c9ada2af9 100755 --- a/.github/scripts/validate-examples.sh +++ b/.github/scripts/validate-examples.sh @@ -9,7 +9,7 @@ set -e echo "Validating NeTEx XML examples ..." -if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then +if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml examples/functions/calendar/*.xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m' else echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m' From 5ae4fc0ee7c912b18e113784527480babf9330a4 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Sat, 4 Nov 2023 22:34:50 +0100 Subject: [PATCH 4/8] Skip this validation due to xmllint bug See: #546 --- .../standards/epiap/{ => skip}/Chur_Equipment_Pathlink_Readme.txt | 0 .../standards/epiap/{ => skip}/Chur_Equipment_Pathlink_V1.0.gpx | 0 .../standards/epiap/{ => skip}/Chur_Equipment_Pathlink_V1.0.xml | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename examples/standards/epiap/{ => skip}/Chur_Equipment_Pathlink_Readme.txt (100%) rename examples/standards/epiap/{ => skip}/Chur_Equipment_Pathlink_V1.0.gpx (100%) rename examples/standards/epiap/{ => skip}/Chur_Equipment_Pathlink_V1.0.xml (100%) diff --git a/examples/standards/epiap/Chur_Equipment_Pathlink_Readme.txt b/examples/standards/epiap/skip/Chur_Equipment_Pathlink_Readme.txt similarity index 100% rename from examples/standards/epiap/Chur_Equipment_Pathlink_Readme.txt rename to examples/standards/epiap/skip/Chur_Equipment_Pathlink_Readme.txt diff --git a/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.gpx b/examples/standards/epiap/skip/Chur_Equipment_Pathlink_V1.0.gpx similarity index 100% rename from examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.gpx rename to examples/standards/epiap/skip/Chur_Equipment_Pathlink_V1.0.gpx diff --git a/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.xml b/examples/standards/epiap/skip/Chur_Equipment_Pathlink_V1.0.xml similarity index 100% rename from examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.xml rename to examples/standards/epiap/skip/Chur_Equipment_Pathlink_V1.0.xml From 2d76a3e319f271d3938738a1f400ccd0b84e7c33 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Sat, 4 Nov 2023 22:38:09 +0100 Subject: [PATCH 5/8] Move this out of the way too --- examples/standards/epiap/{ => skip}/eiap_test1_ramp.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename examples/standards/epiap/{ => skip}/eiap_test1_ramp.xml (100%) diff --git a/examples/standards/epiap/eiap_test1_ramp.xml b/examples/standards/epiap/skip/eiap_test1_ramp.xml similarity index 100% rename from examples/standards/epiap/eiap_test1_ramp.xml rename to examples/standards/epiap/skip/eiap_test1_ramp.xml From 8cafb04f1db9054834e85d80e2a5235a15a9f641 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Sat, 4 Nov 2023 22:43:45 +0100 Subject: [PATCH 6/8] try to split up the validation --- .github/scripts/validate-examples.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/validate-examples.sh b/.github/scripts/validate-examples.sh index c9ada2af9..c47eb1e97 100755 --- a/.github/scripts/validate-examples.sh +++ b/.github/scripts/validate-examples.sh @@ -9,7 +9,7 @@ set -e echo "Validating NeTEx XML examples ..." -if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml examples/functions/calendar/*.xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then +if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml examples/functions/calendar/*.xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m' else echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m' From d45287135c2c5c4dc124a9baf23deb66f76b8ed7 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Sat, 4 Nov 2023 22:52:57 +0100 Subject: [PATCH 7/8] Lets split the validation. --- .github/scripts/validate-examples.sh | 2 +- .../epiap/{skip => }/Chur_Equipment_Pathlink_Readme.txt | 0 .../standards/epiap/{skip => }/Chur_Equipment_Pathlink_V1.0.gpx | 0 .../standards/epiap/{skip => }/Chur_Equipment_Pathlink_V1.0.xml | 0 examples/standards/epiap/{skip => }/eiap_test1_ramp.xml | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename examples/standards/epiap/{skip => }/Chur_Equipment_Pathlink_Readme.txt (100%) rename examples/standards/epiap/{skip => }/Chur_Equipment_Pathlink_V1.0.gpx (100%) rename examples/standards/epiap/{skip => }/Chur_Equipment_Pathlink_V1.0.xml (100%) rename examples/standards/epiap/{skip => }/eiap_test1_ramp.xml (100%) diff --git a/.github/scripts/validate-examples.sh b/.github/scripts/validate-examples.sh index c47eb1e97..d2be5eb89 100755 --- a/.github/scripts/validate-examples.sh +++ b/.github/scripts/validate-examples.sh @@ -9,7 +9,7 @@ set -e echo "Validating NeTEx XML examples ..." -if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml examples/functions/calendar/*.xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then +if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*.xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m' else echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m' diff --git a/examples/standards/epiap/skip/Chur_Equipment_Pathlink_Readme.txt b/examples/standards/epiap/Chur_Equipment_Pathlink_Readme.txt similarity index 100% rename from examples/standards/epiap/skip/Chur_Equipment_Pathlink_Readme.txt rename to examples/standards/epiap/Chur_Equipment_Pathlink_Readme.txt diff --git a/examples/standards/epiap/skip/Chur_Equipment_Pathlink_V1.0.gpx b/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.gpx similarity index 100% rename from examples/standards/epiap/skip/Chur_Equipment_Pathlink_V1.0.gpx rename to examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.gpx diff --git a/examples/standards/epiap/skip/Chur_Equipment_Pathlink_V1.0.xml b/examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.xml similarity index 100% rename from examples/standards/epiap/skip/Chur_Equipment_Pathlink_V1.0.xml rename to examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.xml diff --git a/examples/standards/epiap/skip/eiap_test1_ramp.xml b/examples/standards/epiap/eiap_test1_ramp.xml similarity index 100% rename from examples/standards/epiap/skip/eiap_test1_ramp.xml rename to examples/standards/epiap/eiap_test1_ramp.xml From 161fe71a84ecefda28cfcae2484404d741e673b4 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Tue, 7 Nov 2023 12:21:56 +0100 Subject: [PATCH 8/8] Revert EXTERNAl back to 1.0. --- .../fares/ENTUR-SchoolTwiceADayTripCarnet_2020120.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/functions/fares/ENTUR-SchoolTwiceADayTripCarnet_2020120.xml b/examples/functions/fares/ENTUR-SchoolTwiceADayTripCarnet_2020120.xml index 545bfac69..9b2616ba7 100644 --- a/examples/functions/fares/ENTUR-SchoolTwiceADayTripCarnet_2020120.xml +++ b/examples/functions/fares/ENTUR-SchoolTwiceADayTripCarnet_2020120.xml @@ -200,7 +200,7 @@ School transport with limited number of rides beforeTravel - + @@ -396,7 +396,7 @@ - + @@ -411,7 +411,7 @@ - + @@ -440,7 +440,7 @@ - + @@ -455,7 +455,7 @@ - +