Update all schematron rules to the latest version

Also update the changelog to mention this for version 0.3.1.

CHANGELOG.md

@@ -1,4 +1,7 @@
 # SDK 0.3.0 Release Notes
+
+*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.*
+
 Below is a list of the major updates made to the SDK in this release.
 
 The documentation is available as separate Asciidoc files, one per section.

schematrons/entry.sch

@@ -13,6 +13,8 @@
 	<ns prefix="pin" uri="urn:oasis:names:specification:ubl:schema:xsd:PriorInformationNotice-2" />
 	<title>eForms schematron rules</title>
 
+	<let name="noticeSubType" value="/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/text()"/>
+
 	<include href="stage-1-preliminary.sch"/>
 	<include href="stage-1.sch"/>
 	<include href="stage-2.sch"/>

schematrons/stage-1-preliminary.sch

@@ -1,111 +1,100 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pattern id="EFORMS-stage-1-preliminary" xmlns="http://purl.oclc.org/dsdl/schematron">
-	<rule context="/">
-		<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>
-	</rule>
-	<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'))]">
-		<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>
-	</rule>
-	<rule context="/*[/*/cbc:NoticeTypeCode/text()='pin-buyer']">
-		<assert test="count(cac:ProcurementProjectLot) = 0">The prohibited child element cac:ProcurementProjectLot is present in context /*[/*/cbc:NoticeTypeCode/text()='pin-buyer'].</assert>
-	</rule>
-	<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']">
-		<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>
-	</rule>
-	<rule context="/*/cac:ProcurementProjectLot/cac:TenderingProcess[/*/cac:TenderingProcess/cbc:ProcedureCode/text() = ('oth-single', 'neg-wo-call', 'open')]">
-		<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>
+	<rule context="/*">
+		<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>
+		<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>
 	</rule>
 	<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')]">
-		<assert test="exists(efac:ReceivedSubmissionsStatistics)">The mandatory information on received submissions is missing.</assert>
+		<assert role="ERROR" test="exists(efac:ReceivedSubmissionsStatistics)">The mandatory information on received submissions is missing.</assert>
 	</rule>
 	<rule context="cac:ProcurementProjectLot/cbc:ID">
-		<assert test="@schemeName">The mandatory attribute @schemeName is missing.</assert>
+		<assert role="ERROR" test="@schemeName">The mandatory attribute @schemeName is missing.</assert>
 	</rule>
 	<rule context="cac:ProcurementProjectLot/cbc:ID/@schemeName">
-		<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>
+		<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>
 	</rule>
 	<rule context="cbc:ActivityTypeCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:AwardingCriterionTypeCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:CalculationExpressionCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:Code">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:ContractingSystemTypeCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:CountrySubentityCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:CriterionTypeCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:DescriptionCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:DocumentTypeCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:ExecutionRequirementCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:FundingProgramCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:GuaranteeTypeCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:IndustryClassificationCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:ItemClassificationCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:NoticeTypeCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:PartPresentationCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:PartyTypeCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:ProcedureCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:ProcessReasonCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:ProcurementTypeCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:RequiredCurriculaCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:SubcontractingConditionsCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:SubmissionMethodCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:TendererRequirementTypeCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:TenderResultCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="cbc:VariantConstraintCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
-	<rule context="efbc:ReasonCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+	<rule context="cbc:ReasonCode">
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 	<rule context="efbc:StatisticsCode">
-		<assert test="@listName">The mandatory attribute @listName is missing.</assert>
+		<assert role="ERROR" test="@listName">The mandatory attribute @listName is missing.</assert>
 	</rule>
 </pattern>