Skip to content

Commit 217d8ca

Browse files
bertrand-lorentzbertrand-lorentz
committed
Update all schematron rules to the latest version
Also update the changelog to mention this for version 0.3.1.
1 parent c923bba commit 217d8ca

File tree

8 files changed

+39484
-38192
lines changed

8 files changed

+39484
-38192
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# SDK 0.3.0 Release Notes
2+
3+
*Update: An older version of the schematron rules was included by mistake in version 0.3.0. Version 0.3.1 includes the latest version of the schematron rules.*
4+
25
Below is a list of the major updates made to the SDK in this release.
36

47
The documentation is available as separate Asciidoc files, one per section.

‎schematrons/entry.sch

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<ns prefix="pin" uri="urn:oasis:names:specification:ubl:schema:xsd:PriorInformationNotice-2" />
1414
<title>eForms schematron rules</title>
1515

16+
<let name="noticeSubType" value="/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/text()"/>
17+
1618
<include href="stage-1-preliminary.sch"/>
1719
<include href="stage-1.sch"/>
1820
<include href="stage-2.sch"/>

‎schematrons/stage-1-preliminary.sch

Lines changed: 35 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,100 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<pattern id="EFORMS-stage-1-preliminary" xmlns="http://purl.oclc.org/dsdl/schematron">
3-
<rule context="/">
4-
<assert role="error" test="count(*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode) &gt; 0">The OPP-070 Notice Subtype is mandatory.</assert>
5-
</rule>
6-
<rule context="/*[(/*/cbc:NoticeTypeCode/text()=('pmc', 'pin-only', 'pin-rtl', 'pin-cfc-standard', 'pin-cfc-social', 'qu-sy', 'cn-standard', 'cn-social', 'subco', 'cn-desg', 'veat', 'can-standard', 'can-social', 'can-desg', 'can-modif', 'cc'))]">
7-
<assert test="exists(cac:ProcurementProjectLot)">The mandatory child element cac:ProcurementProjectLot is missing in context /*[(/*/cbc:NoticeTypeCode/text()=('pmc', 'pin-only', 'pin-rtl', 'pin-cfc-standard', 'pin-cfc-social', 'qu-sy', 'cn-standard', 'cn-social', 'subco', 'cn-desg', 'veat', 'can-standard', 'can-social', 'can-desg', 'can-modif', 'cc'))].</assert>
8-
</rule>
9-
<rule context="/*[/*/cbc:NoticeTypeCode/text()='pin-buyer']">
10-
<assert test="count(cac:ProcurementProjectLot) = 0">The prohibited child element cac:ProcurementProjectLot is present in context /*[/*/cbc:NoticeTypeCode/text()='pin-buyer'].</assert>
11-
</rule>
12-
<rule context="/*/cac:ProcurementProjectLot/cac:TenderingProcess[/*/cac:TenderingProcess/cbc:ProcedureCode/text() = ('restricted', 'neg-w-call', 'comp-dial', 'innovation', 'oth-mult')][/*/cbc:NoticeTypeCode/text()='cn-standard'][/*/cbc:RegulatoryDomain/text()='32014L0024']">
13-
<assert test="exists(cac:EconomicOperatorShortList)">The mandatory child element cac:EconomicOperatorShortList is missing in context /*/cac:ProcurementProjectLot/cac:TenderingProcess[/*/cac:TenderingProcess/cbc:ProcedureCode/text() = ('restricted', 'neg-w-call', 'comp-dial', 'innovation', 'oth-mult')][/*/cbc:NoticeTypeCode/text()='cn-standard'][/*/cbc:RegulatoryDomain/text()='32014L0024'].</assert>
14-
</rule>
15-
<rule context="/*/cac:ProcurementProjectLot/cac:TenderingProcess[/*/cac:TenderingProcess/cbc:ProcedureCode/text() = ('oth-single', 'neg-wo-call', 'open')]">
16-
<assert test="count(cac:EconomicOperatorShortList) = 0">The prohibited child element cac:EconomicOperatorShortList is present in context /*/cac:ProcurementProjectLot/cac:TenderingProcess[/*/cac:TenderingProcess/cbc:ProcedureCode/text() = ('oth-single', 'neg-wo-call', 'open')].</assert>
3+
<rule context="/*">
4+
<assert role="ERROR" test="count(ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode) &gt; 0">The OPP-070 Notice Subtype is mandatory.</assert>
5+
<assert role="ERROR" test="(cbc:NoticeTypeCode/text() = ('pin-buyer', 'brin-eeig', 'brin-ecs') and count(cac:ProcurementProjectLot) = 0) or (not(cbc:NoticeTypeCode/text() = ('pin-buyer', 'brin-eeig', 'brin-ecs')) and count(cac:ProcurementProjectLot) > 0)">The element cac:ProcurementProjectLot must not be present in 'pin-buyer', 'brin-eeig' and 'brin-ecs' notices, and is mandatory in other notices.</assert>
176
</rule>
187
<rule context="/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult[/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/text() = ('29', '30', '31', '32', '33', '34', '35', '36', '37')]">
19-
<assert test="exists(efac:ReceivedSubmissionsStatistics)">The mandatory information on received submissions is missing.</assert>
8+
<assert role="ERROR" test="exists(efac:ReceivedSubmissionsStatistics)">The mandatory information on received submissions is missing.</assert>
209
</rule>
2110
<rule context="cac:ProcurementProjectLot/cbc:ID">
22-
<assert test="@schemeName">The mandatory attribute @schemeName is missing.</assert>
11+
<assert role="ERROR" test="@schemeName">The mandatory attribute @schemeName is missing.</assert>
2312
</rule>
2413
<rule context="cac:ProcurementProjectLot/cbc:ID/@schemeName">
25-
<assert test="contains('&#x7F;Part&#x7F;Lot&#x7F;LotsGroup&#x7F;', concat('&#x7F;',.,'&#x7F;'))">The specified scheme name for the lot identifier is not valid.</assert>
14+
<assert role="ERROR" test="contains('&#x7F;Part&#x7F;Lot&#x7F;LotsGroup&#x7F;', concat('&#x7F;',.,'&#x7F;'))">The specified scheme name for the lot identifier is not valid.</assert>
2615
</rule>
2716
<rule context="cbc:ActivityTypeCode">
28-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
17+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
2918
</rule>
3019
<rule context="cbc:AwardingCriterionTypeCode">
31-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
20+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
3221
</rule>
3322
<rule context="cbc:CalculationExpressionCode">
34-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
23+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
3524
</rule>
3625
<rule context="cbc:Code">
37-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
26+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
3827
</rule>
3928
<rule context="cbc:ContractingSystemTypeCode">
40-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
29+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
4130
</rule>
4231
<rule context="cbc:CountrySubentityCode">
43-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
32+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
4433
</rule>
4534
<rule context="cbc:CriterionTypeCode">
46-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
35+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
4736
</rule>
4837
<rule context="cbc:DescriptionCode">
49-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
38+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
5039
</rule>
5140
<rule context="cbc:DocumentTypeCode">
52-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
41+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
5342
</rule>
5443
<rule context="cbc:ExecutionRequirementCode">
55-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
44+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
5645
</rule>
5746
<rule context="cbc:FundingProgramCode">
58-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
47+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
5948
</rule>
6049
<rule context="cbc:GuaranteeTypeCode">
61-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
50+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
6251
</rule>
6352
<rule context="cbc:IndustryClassificationCode">
64-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
53+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
6554
</rule>
6655
<rule context="cbc:ItemClassificationCode">
67-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
56+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
6857
</rule>
6958
<rule context="cbc:NoticeTypeCode">
70-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
59+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
7160
</rule>
7261
<rule context="cbc:PartPresentationCode">
73-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
62+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
7463
</rule>
7564
<rule context="cbc:PartyTypeCode">
76-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
65+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
7766
</rule>
7867
<rule context="cbc:ProcedureCode">
79-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
68+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
8069
</rule>
8170
<rule context="cbc:ProcessReasonCode">
82-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
71+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
8372
</rule>
8473
<rule context="cbc:ProcurementTypeCode">
85-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
74+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
8675
</rule>
8776
<rule context="cbc:RequiredCurriculaCode">
88-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
77+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
8978
</rule>
9079
<rule context="cbc:SubcontractingConditionsCode">
91-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
80+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
9281
</rule>
9382
<rule context="cbc:SubmissionMethodCode">
94-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
83+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
9584
</rule>
9685
<rule context="cbc:TendererRequirementTypeCode">
97-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
86+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
9887
</rule>
9988
<rule context="cbc:TenderResultCode">
100-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
89+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
10190
</rule>
10291
<rule context="cbc:VariantConstraintCode">
103-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
92+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
10493
</rule>
105-
<rule context="efbc:ReasonCode">
106-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
94+
<rule context="cbc:ReasonCode">
95+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
10796
</rule>
10897
<rule context="efbc:StatisticsCode">
109-
<assert test="@listName">The mandatory attribute @listName is missing.</assert>
98+
<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
11099
</rule>
111100
</pattern>

0 commit comments

Comments
 (0)