Merge branch 'master' into IDMP-648

edmcouncil · Nov 22, 2024 · 91853c6 · 91853c6
2 parents 7115709 + 0a64d96
commit 91853c6
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 139 deletions.
diff --git a/EXT/Examples/AmlodipineExample.rdf b/EXT/Examples/AmlodipineExample.rdf
@@ -123,7 +123,7 @@
 		<owl:imports rdf:resource="https://www.omg.org/spec/LCC/Countries/ISO3166-1-CountryCodes/"/>
 		<owl:imports rdf:resource="https://www.omg.org/spec/LCC/Languages/ISO639-1-LanguageCodes/"/>
 		<owl:imports rdf:resource="https://www.omg.org/spec/MVF/MultipleVocabularyFacility/"/>
-		<owl:versionIRI rdf:resource="https://spec.pistoiaalliance.org/idmp/ontology/EXT/20240801/Examples/AmlodipineExample/"/>
+		<owl:versionIRI rdf:resource="https://spec.pistoiaalliance.org/idmp/ontology/EXT/20241001/Examples/AmlodipineExample/"/>
 		<idmp-chg:hasMaturityLevel rdf:resource="&idmp-chg;Informative"/>
 		<cmns-av:copyright>Copyright (c) 2022-2024 EDM Council, Inc.</cmns-av:copyright>
 		<cmns-av:copyright>Copyright (c) 2022-2024 Pistoia Alliance, Inc.</cmns-av:copyright>
@@ -1122,13 +1122,15 @@
 	</owl:NamedIndividual>
 
 	<owl:NamedIndividual rdf:about="&idmp-amp;NorvascBlister">
-		<rdf:type rdf:resource="&idmp-mprd;MedicinalProductContainer"/>
 		<rdf:type rdf:resource="&idmp-mprd;PackageItem"/>
 		<rdfs:label>Norvasc blister</rdfs:label>
 		<idmp-mprd:contains rdf:resource="&idmp-amp;Norvasc-ManufacturedItem-5mgTablet"/>
 		<idmp-mprd:hasPackageComponent rdf:resource="&idmp-amp;NorvascBlisterFormComponent"/>
 		<idmp-mprd:hasPackageComponent rdf:resource="&idmp-amp;NorvascBlisterLiddingComponent"/>
 		<idmp-mprd:hasPackageItemType rdf:resource="https://spor.ema.europa.eu/v1/lists/100000073346/terms/100000073496"/>
+		<cmns-col:hasConstituent rdf:resource="&idmp-amp;NorvascBlisterTabletComponent"/>
+		<cmns-col:isPartOf rdf:resource="&idmp-amp;NorvascPackagedMedicinalProduct"/>
+		<cmns-rlcmp:playsRole rdf:resource="&idmp-amp;NorvascBlisterAsImmediateContainer"/>
 	</owl:NamedIndividual>
 
 	<owl:NamedIndividual rdf:about="&idmp-amp;NorvascBlisterAsImmediateContainer">
@@ -1138,14 +1140,6 @@
 		<cmns-rlcmp:isPlayedBy rdf:resource="&idmp-amp;NorvascBlister"/>
 	</owl:NamedIndividual>
 
-	<owl:NamedIndividual rdf:about="&idmp-amp;NorvascBlisterComposition">
-		<rdf:type rdf:resource="&idmp-mprd;ContainerConstituency"/>
-		<rdfs:label>Norvasc blister composition</rdfs:label>
-		<cmns-col:hasConstituent rdf:resource="&idmp-amp;NorvascBlisterTabletComponent"/>
-		<cmns-cxtdsg:isApplicableIn rdf:resource="&idmp-amp;NorvascPackagedMedicinalProduct"/>
-		<cmns-dsg:defines rdf:resource="&idmp-amp;NorvascBlister"/>
-	</owl:NamedIndividual>
-
 	<owl:NamedIndividual rdf:about="&idmp-amp;NorvascBlisterFormComponent">
 		<rdf:type rdf:resource="&idmp-mprd;PackageComponent"/>
 		<rdfs:label>Norvasc blister form component</rdfs:label>
@@ -1175,6 +1169,7 @@
 
 	<owl:NamedIndividual rdf:about="&idmp-amp;NorvascBlisterTabletComponent">
 		<rdf:type rdf:resource="&idmp-mprd;ContainerConstituent"/>
+		<rdfs:label>Norvasc blister tablet component</rdfs:label>
 		<idmp-mprd:hasManufacturedItemQuantity>
 			<cmns-qtu:ScalarQuantityValue>
 				<cmns-qtu:hasMeasurementUnit rdf:resource="https://spor.ema.europa.eu/v1/lists/200000000014/terms/200000002152"/>
@@ -1190,7 +1185,9 @@
 		<idmp-mprd:contains rdf:resource="&idmp-amp;NorvascBlister"/>
 		<idmp-mprd:hasPackageItemType rdf:resource="https://spor.ema.europa.eu/v1/lists/100000073346/terms/100000073498"/>
 		<cmns-col:comprises rdf:resource="https://spor.ema.europa.eu/v1/lists/200000003199/terms/200000003529"/>
-		<cmns-dsg:isDefinedIn rdf:resource="&idmp-amp;NorvascBoxComposition"/>
+		<cmns-col:hasConstituent rdf:resource="&idmp-amp;NorvascBoxBlisterComponent"/>
+		<cmns-col:isPartOf rdf:resource="&idmp-amp;NorvascPackagedMedicinalProduct"/>
+		<cmns-rlcmp:playsRole rdf:resource="&idmp-amp;NorvascBoxAsOuterPackaging"/>
 	</owl:NamedIndividual>
 
 	<owl:NamedIndividual rdf:about="&idmp-amp;NorvascBoxAsOuterPackaging">
@@ -1213,14 +1210,6 @@
 		<idmp-mprd:isCharacterizedByPackageItem rdf:resource="&idmp-amp;NorvascBlister"/>
 	</owl:NamedIndividual>
 
-	<owl:NamedIndividual rdf:about="&idmp-amp;NorvascBoxComposition">
-		<rdf:type rdf:resource="&idmp-mprd;ContainerConstituency"/>
-		<rdfs:label>Norvasc box composition</rdfs:label>
-		<cmns-col:hasConstituent rdf:resource="&idmp-amp;NorvascBoxBlisterComponent"/>
-		<cmns-cxtdsg:isApplicableIn rdf:resource="&idmp-amp;NorvascPackagedMedicinalProduct"/>
-		<cmns-dsg:defines rdf:resource="&idmp-amp;NorvascBox"/>
-	</owl:NamedIndividual>
-
 	<owl:NamedIndividual rdf:about="&idmp-amp;NorvascComposition">
 		<rdf:type rdf:resource="&idmp-mprd;ProductComposition"/>
 		<rdfs:label>Norvasc composition</rdfs:label>
@@ -1299,14 +1288,6 @@
 		<cmns-col:comprises rdf:resource="&idmp-amp;NorvascBox"/>
 	</owl:NamedIndividual>
 
-	<owl:NamedIndividual rdf:about="&idmp-amp;NorvascPackagedMedicinalProductConstituency">
-		<rdf:type rdf:resource="&idmp-mprd;ContainerConstituency"/>
-		<rdfs:label>Norvasc packaged medicinal product constituency</rdfs:label>
-		<cmns-cxtdsg:isApplicableIn rdf:resource="&idmp-amp;NorvascPackagedMedicinalProduct"/>
-		<cmns-dsg:defines rdf:resource="&idmp-amp;NorvascPackagedMedicinalProduct"/>
-		<cmns-rlcmp:hasRole rdf:resource="&idmp-amp;NorvascBoxAsOuterPackaging"/>
-	</owl:NamedIndividual>
-
 	<owl:NamedIndividual rdf:about="&idmp-amp;NorvascTherapeuticIndicationTextInDenmark">
 		<rdf:type rdf:resource="&idmp-mprd;TherapeuticIndicationText"/>
 		<rdfs:label>Norvasc, Therapeutic Indication Text, Denmark</rdfs:label>

diff --git a/EXT/Examples/QlairaExample.rdf b/EXT/Examples/QlairaExample.rdf
@@ -906,21 +906,16 @@
 		<idmp-mprd:hasPackageItemType rdf:resource="https://spor.ema.europa.eu/v1/lists/100000073346/terms/100000073498"/>
 		<idmp-mprd:isContainedIn rdf:resource="&idmp-qla;Qlaira-PackagedMedicinalProduct-1x28Box"/>
 		<cmns-col:comprises rdf:resource="https://spor.ema.europa.eu/v1/lists/200000003199/terms/200000003529"/>
-		<cmns-dsg:isDefinedIn rdf:resource="&idmp-qla;Qlaira-PackageItem-1x28Box-Constituency"/>
+		<cmns-col:hasConstituent rdf:resource="&idmp-qla;Qlaira-PackageItem-1x28Box-ContainerConstituent-1x28TabletBlister"/>
+		<cmns-col:isPartOf rdf:resource="&idmp-qla;Qlaira-PackagedMedicinalProduct-1x28Box"/>
 		<cmns-rlcmp:playsRole rdf:resource="&idmp-qla;Qlaira-PackageItem-1x28Box-AsOuterPackaging"/>
 	</owl:NamedIndividual>
 
 	<owl:NamedIndividual rdf:about="&idmp-qla;Qlaira-PackageItem-1x28Box-AsOuterPackaging">
 		<rdf:type rdf:resource="&idmp-mprd;ContainerRole"/>
 		<rdfs:label>Qlaira, package item, 1 x 28 box, as outer packaging</rdfs:label>
 		<cmns-cls:isClassifiedBy rdf:resource="&idmp-mprd;OuterPackaging"/>
-	</owl:NamedIndividual>
-
-	<owl:NamedIndividual rdf:about="&idmp-qla;Qlaira-PackageItem-1x28Box-Constituency">
-		<rdf:type rdf:resource="&cmns-rlcmp;Composition"/>
-		<rdfs:label>Qlaira, package item, 1 x 28 box, constituency</rdfs:label>
-		<cmns-col:hasConstituent rdf:resource="&idmp-qla;Qlaira-PackageItem-1x28Box-ContainerConstituent-1x28TabletBlister"/>
-		<cmns-dsg:defines rdf:resource="&idmp-qla;Qlaira-PackageItem-1x28Box"/>
+		<cmns-rlcmp:isPlayedBy rdf:resource="&idmp-qla;Qlaira-PackageItem-1x28Box"/>
 	</owl:NamedIndividual>
 
 	<owl:NamedIndividual rdf:about="&idmp-qla;Qlaira-PackageItem-1x28Box-ContainerConstituent-1x28TabletBlister">
@@ -937,36 +932,45 @@
 
 	<owl:NamedIndividual rdf:about="&idmp-qla;Qlaira-PackageItem-28TabletBlister">
 		<rdf:type rdf:resource="&idmp-mprd;PackageItem"/>
+		<rdf:type>
+			<owl:Restriction>
+				<owl:onProperty rdf:resource="&idmp-mprd;isContainedIn"/>
+				<owl:someValuesFrom>
+					<owl:Class>
+						<owl:oneOf rdf:parseType="Collection">
+							<rdf:Description rdf:about="&idmp-qla;Qlaira-PackageItem-1x28Box">
+							</rdf:Description>
+							<rdf:Description rdf:about="&idmp-qla;Qlaira-PackageItem-3x28Box">
+							</rdf:Description>
+							<rdf:Description rdf:about="&idmp-qla;Qlaira-PackageItem-6x28Box">
+							</rdf:Description>
+						</owl:oneOf>
+					</owl:Class>
+				</owl:someValuesFrom>
+			</owl:Restriction>
+		</rdf:type>
 		<rdfs:label>Qlaira, package item, 28 tablet blister</rdfs:label>
 		<idmp-mprd:contains rdf:resource="&idmp-qla;Qlaira-ManufacturedItem-DarkRedTablets"/>
 		<idmp-mprd:contains rdf:resource="&idmp-qla;Qlaira-ManufacturedItem-DarkYellowTablets"/>
 		<idmp-mprd:contains rdf:resource="&idmp-qla;Qlaira-ManufacturedItem-LightYellowTablets"/>
 		<idmp-mprd:contains rdf:resource="&idmp-qla;Qlaira-ManufacturedItem-MediumRedTablets"/>
 		<idmp-mprd:contains rdf:resource="&idmp-qla;Qlaira-ManufacturedItem-WhiteTablets"/>
 		<idmp-mprd:hasPackageItemType rdf:resource="https://spor.ema.europa.eu/v1/lists/100000073346/terms/100000073496"/>
-		<idmp-mprd:isContainedIn rdf:resource="&idmp-qla;Qlaira-PackageItem-1x28Box"/>
-		<idmp-mprd:isContainedIn rdf:resource="&idmp-qla;Qlaira-PackageItem-3x28Box"/>
-		<idmp-mprd:isContainedIn rdf:resource="&idmp-qla;Qlaira-PackageItem-6x28Box"/>
 		<cmns-col:comprises rdf:resource="https://spor.ema.europa.eu/v1/lists/200000003199/terms/200000003200"/>
 		<cmns-col:comprises rdf:resource="https://spor.ema.europa.eu/v1/lists/200000003199/terms/200000003222"/>
-		<cmns-dsg:isDefinedIn rdf:resource="&idmp-qla;Qlaira-PackageItem-28TabletBlister-Constituency"/>
+		<cmns-col:hasConstituent rdf:resource="&idmp-qla;Qlaira-PackageItem-28TabletBlister-ContainerConstituent-17xLightYellowTablets"/>
+		<cmns-col:hasConstituent rdf:resource="&idmp-qla;Qlaira-PackageItem-28TabletBlister-ContainerConstituent-2xDarkRedTablets"/>
+		<cmns-col:hasConstituent rdf:resource="&idmp-qla;Qlaira-PackageItem-28TabletBlister-ContainerConstituent-2xDarkYellowTablets"/>
+		<cmns-col:hasConstituent rdf:resource="&idmp-qla;Qlaira-PackageItem-28TabletBlister-ContainerConstituent-2xWhiteTablets"/>
+		<cmns-col:hasConstituent rdf:resource="&idmp-qla;Qlaira-PackageItem-28TabletBlister-ContainerConstituent-5xMediumRedTablets"/>
 		<cmns-rlcmp:playsRole rdf:resource="&idmp-qla;Qlaira-PackageItem-28TabletBlister-AsImmediateContainer"/>
 	</owl:NamedIndividual>
 
 	<owl:NamedIndividual rdf:about="&idmp-qla;Qlaira-PackageItem-28TabletBlister-AsImmediateContainer">
 		<rdf:type rdf:resource="&idmp-mprd;ContainerRole"/>
 		<rdfs:label>Qlaira, package item, 28 tablet blister, as immediate container</rdfs:label>
 		<cmns-cls:isClassifiedBy rdf:resource="&idmp-mprd;ImmediateContainer"/>
-	</owl:NamedIndividual>
-
-	<owl:NamedIndividual rdf:about="&idmp-qla;Qlaira-PackageItem-28TabletBlister-Constituency">
-		<rdfs:label>Qlaira, package item, 28 tablet blister, constituency</rdfs:label>
-		<cmns-col:hasConstituent rdf:resource="&idmp-qla;Qlaira-PackageItem-28TabletBlister-ContainerConstituent-17xLightYellowTablets"/>
-		<cmns-col:hasConstituent rdf:resource="&idmp-qla;Qlaira-PackageItem-28TabletBlister-ContainerConstituent-2xDarkRedTablets"/>
-		<cmns-col:hasConstituent rdf:resource="&idmp-qla;Qlaira-PackageItem-28TabletBlister-ContainerConstituent-2xDarkYellowTablets"/>
-		<cmns-col:hasConstituent rdf:resource="&idmp-qla;Qlaira-PackageItem-28TabletBlister-ContainerConstituent-2xWhiteTablets"/>
-		<cmns-col:hasConstituent rdf:resource="&idmp-qla;Qlaira-PackageItem-28TabletBlister-ContainerConstituent-5xMediumRedTablets"/>
-		<cmns-dsg:defines rdf:resource="&idmp-qla;Qlaira-PackageItem-28TabletBlister"/>
+		<cmns-rlcmp:isPlayedBy rdf:resource="&idmp-qla;Qlaira-PackageItem-28TabletBlister"/>
 	</owl:NamedIndividual>
 
 	<owl:NamedIndividual rdf:about="&idmp-qla;Qlaira-PackageItem-28TabletBlister-ContainerConstituent-17xLightYellowTablets">
@@ -1029,40 +1033,35 @@
 		<idmp-mprd:isCharacterizedByManufacturedItem rdf:resource="&idmp-qla;Qlaira-ManufacturedItem-MediumRedTablets"/>
 	</owl:NamedIndividual>
 
-	<owl:NamedIndividual rdf:about="&idmp-qla;Qlaira-PackageItem-3s28Box-ContainerConstituent-3x28TabletBlister">
-		<rdf:type rdf:resource="&idmp-mprd;ContainerConstituent"/>
-		<rdfs:label>Qlaira, package item, 3 x 28 box, container constituent, 3 x 28 tablet blister</rdfs:label>
-		<idmp-mprd:hasPackageItemQuantity>
-			<cmns-qtu:ScalarQuantityValue>
-				<cmns-qtu:hasMeasurementUnit rdf:resource="https://spor.ema.europa.eu/v1/lists/200000000014/terms/200000002109"/>
-				<cmns-qtu:hasNumericValue rdf:datatype="&xsd;decimal">3.0</cmns-qtu:hasNumericValue>
-			</cmns-qtu:ScalarQuantityValue>
-		</idmp-mprd:hasPackageItemQuantity>
-		<idmp-mprd:isCharacterizedByPackageItem rdf:resource="&idmp-qla;Qlaira-PackageItem-28TabletBlister"/>
-	</owl:NamedIndividual>
-
 	<owl:NamedIndividual rdf:about="&idmp-qla;Qlaira-PackageItem-3x28Box">
 		<rdf:type rdf:resource="&idmp-mprd;PackageItem"/>
 		<rdfs:label>Qlaira, package item, 3 x 28 box,</rdfs:label>
 		<idmp-mprd:contains rdf:resource="&idmp-qla;Qlaira-PackageItem-28TabletBlister"/>
 		<idmp-mprd:hasPackageItemType rdf:resource="https://spor.ema.europa.eu/v1/lists/100000073346/terms/100000073498"/>
 		<idmp-mprd:isContainedIn rdf:resource="&idmp-qla;Qlaira-PackagedMedicinalProduct-3x28Box"/>
 		<cmns-col:comprises rdf:resource="https://spor.ema.europa.eu/v1/lists/200000003199/terms/200000003529"/>
-		<cmns-dsg:isDefinedIn rdf:resource="&idmp-qla;Qlaira-PackageItem-3x28Box-Constituency"/>
+		<cmns-col:hasConstituent rdf:resource="&idmp-qla;Qlaira-PackageItem-3x28Box-ContainerConstituent-3x28TabletBlister"/>
+		<cmns-col:isPartOf rdf:resource="&idmp-qla;Qlaira-PackagedMedicinalProduct-3x28Box"/>
 		<cmns-rlcmp:playsRole rdf:resource="&idmp-qla;Qlaira-PackageItem-3x28Box-AsOuterPackaging"/>
 	</owl:NamedIndividual>
 
 	<owl:NamedIndividual rdf:about="&idmp-qla;Qlaira-PackageItem-3x28Box-AsOuterPackaging">
 		<rdf:type rdf:resource="&idmp-mprd;ContainerRole"/>
 		<rdfs:label>Qlaira, package item, 3 x 28 box, as outer packaging</rdfs:label>
 		<cmns-cls:isClassifiedBy rdf:resource="&idmp-mprd;OuterPackaging"/>
+		<cmns-rlcmp:isPlayedBy rdf:resource="&idmp-qla;Qlaira-PackageItem-3x28Box"/>
 	</owl:NamedIndividual>
 
-	<owl:NamedIndividual rdf:about="&idmp-qla;Qlaira-PackageItem-3x28Box-Constituency">
-		<rdf:type rdf:resource="&cmns-rlcmp;Composition"/>
-		<rdfs:label>Qlaira, package item, 3 x 28 box, constituency</rdfs:label>
-		<cmns-col:hasConstituent rdf:resource="&idmp-qla;Qlaira-PackageItem-3s28Box-ContainerConstituent-3x28TabletBlister"/>
-		<cmns-dsg:defines rdf:resource="&idmp-qla;Qlaira-PackageItem-3x28Box"/>
+	<owl:NamedIndividual rdf:about="&idmp-qla;Qlaira-PackageItem-3x28Box-ContainerConstituent-3x28TabletBlister">
+		<rdf:type rdf:resource="&idmp-mprd;ContainerConstituent"/>
+		<rdfs:label>Qlaira, package item, 3 x 28 box, container constituent, 3 x 28 tablet blister</rdfs:label>
+		<idmp-mprd:hasPackageItemQuantity>
+			<cmns-qtu:ScalarQuantityValue>
+				<cmns-qtu:hasMeasurementUnit rdf:resource="https://spor.ema.europa.eu/v1/lists/200000000014/terms/200000002109"/>
+				<cmns-qtu:hasNumericValue rdf:datatype="&xsd;decimal">3.0</cmns-qtu:hasNumericValue>
+			</cmns-qtu:ScalarQuantityValue>
+		</idmp-mprd:hasPackageItemQuantity>
+		<idmp-mprd:isCharacterizedByPackageItem rdf:resource="&idmp-qla;Qlaira-PackageItem-28TabletBlister"/>
 	</owl:NamedIndividual>
 
 	<owl:NamedIndividual rdf:about="&idmp-qla;Qlaira-PackageItem-6x28Box">
@@ -1072,21 +1071,16 @@
 		<idmp-mprd:hasPackageItemType rdf:resource="https://spor.ema.europa.eu/v1/lists/100000073346/terms/100000073498"/>
 		<idmp-mprd:isContainedIn rdf:resource="&idmp-qla;Qlaira-PackagedMedicinalProduct-6x28Box"/>
 		<cmns-col:comprises rdf:resource="https://spor.ema.europa.eu/v1/lists/200000003199/terms/200000003529"/>
-		<cmns-dsg:isDefinedIn rdf:resource="&idmp-qla;Qlaira-PackageItem-6x28Box-Constituency"/>
+		<cmns-col:hasConstituent rdf:resource="&idmp-qla;Qlaira-PackageItem-6x28Box-ContainerConstituent-6x28TabletBlister"/>
+		<cmns-col:isPartOf rdf:resource="&idmp-qla;Qlaira-PackagedMedicinalProduct-6x28Box"/>
 		<cmns-rlcmp:playsRole rdf:resource="&idmp-qla;Qlaira-PackageItem-6x28Box-AsOuterPackaging"/>
 	</owl:NamedIndividual>
 
 	<owl:NamedIndividual rdf:about="&idmp-qla;Qlaira-PackageItem-6x28Box-AsOuterPackaging">
 		<rdf:type rdf:resource="&idmp-mprd;ContainerRole"/>
 		<rdfs:label>Qlaira, package item, 6 x 28 box, as outer packaging</rdfs:label>
 		<cmns-cls:isClassifiedBy rdf:resource="&idmp-mprd;OuterPackaging"/>
-	</owl:NamedIndividual>
-
-	<owl:NamedIndividual rdf:about="&idmp-qla;Qlaira-PackageItem-6x28Box-Constituency">
-		<rdf:type rdf:resource="&cmns-rlcmp;Composition"/>
-		<rdfs:label>Qlaira, package item, 6 x 28 box, constituency</rdfs:label>
-		<cmns-col:hasConstituent rdf:resource="&idmp-qla;Qlaira-PackageItem-6x28Box-ContainerConstituent-6x28TabletBlister"/>
-		<cmns-dsg:defines rdf:resource="&idmp-qla;Qlaira-PackageItem-6x28Box"/>
+		<cmns-rlcmp:isPlayedBy rdf:resource="&idmp-qla;Qlaira-PackageItem-6x28Box"/>
 	</owl:NamedIndividual>
 
 	<owl:NamedIndividual rdf:about="&idmp-qla;Qlaira-PackageItem-6x28Box-ContainerConstituent-6x28TabletBlister">