Merge branch 'master' into unit_test_extension_for_gsrs

edmcouncil · Sep 14, 2023 · 68a5c72 · 68a5c72
2 parents f59010c + 6b8476e
commit 68a5c72
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/EXT/Examples/AmlodipineExample.rdf b/EXT/Examples/AmlodipineExample.rdf
@@ -35,6 +35,7 @@
 	<!ENTITY lcc-639-1 "https://www.omg.org/spec/LCC/Languages/ISO639-1-LanguageCodes/">
 	<!ENTITY lcc-cr "https://www.omg.org/spec/LCC/Countries/CountryRepresentation/">
 	<!ENTITY lcc-lr "https://www.omg.org/spec/LCC/Languages/LanguageRepresentation/">
+	<!ENTITY mvf "https://www.omg.org/spec/MVF/MultipleVocabularyFacility/">
 	<!ENTITY owl "http://www.w3.org/2002/07/owl#">
 	<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 	<!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#">
@@ -77,6 +78,7 @@
 	xmlns:lcc-639-1="https://www.omg.org/spec/LCC/Languages/ISO639-1-LanguageCodes/"
 	xmlns:lcc-cr="https://www.omg.org/spec/LCC/Countries/CountryRepresentation/"
 	xmlns:lcc-lr="https://www.omg.org/spec/LCC/Languages/LanguageRepresentation/"
+	xmlns:mvf="https://www.omg.org/spec/MVF/MultipleVocabularyFacility/"
 	xmlns:owl="http://www.w3.org/2002/07/owl#"
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 	xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
@@ -617,12 +619,17 @@
 		<rdf:type rdf:resource="&idmp-spor;SPOR-RouteOfAdministration"/>
 		<rdfs:label>Norvasc - route of administration</rdfs:label>
 		<skos:definition>taking a medicinal product by means of swallowing</skos:definition>
+		<idmp-spor:hasSPORTermName>
+			<idmp-spor:SPORTermName>
+				<cmns-txt:hasTextValue>Oral use</cmns-txt:hasTextValue>
+				<mvf:hasLanguage rdf:resource="&lcc-639-1;English"/>
+			</idmp-spor:SPORTermName>
+		</idmp-spor:hasSPORTermName>
 		<cmns-id:isIdentifiedBy>
 			<idmp-spor:SPORTermIdentifier>
 				<cmns-txt:hasTextValue>100000073619</cmns-txt:hasTextValue>
 			</idmp-spor:SPORTermIdentifier>
 		</cmns-id:isIdentifiedBy>
-		<cmns-txt:hasTextValue>Oral use</cmns-txt:hasTextValue>
 	</owl:NamedIndividual>
 
 	<owl:NamedIndividual rdf:about="&idmp-amp;NorvascAsAuthorizedMedicinalProductInDenmark">

diff --git a/etc/CQ/Example/uc3_cq3.sparql b/etc/CQ/Example/uc3_cq3.sparql
@@ -8,8 +8,9 @@ PREFIX cmns-pts:    <https://www.omg.org/spec/Commons/PartiesAndSituations/>
 PREFIX cmns-txt:    <https://www.omg.org/spec/Commons/TextDatatype/>
 PREFIX idmp-eura:   <https://spec.pistoiaalliance.org/idmp/ontology/ISO/EuropeanJurisdiction/EuropeanRegistrationAuthorities/>
 PREFIX idmp-mprd:   <https://spec.pistoiaalliance.org/idmp/ontology/ISO/ISO11615-MedicinalProducts/>
-PREFIX idmp-sub:    <https://spec.pistoiaalliance.org/idmp/ontology/ISO/ISO11238-Substances/>
 PREFIX idmp-phprd:  <https://spec.pistoiaalliance.org/idmp/ontology/ISO/ISO11616-PharmaceuticalProducts/> 
+PREFIX idmp-sub:    <https://spec.pistoiaalliance.org/idmp/ontology/ISO/ISO11238-Substances/>
+PREFIX idmp-spor:    <https://spec.pistoiaalliance.org/idmp/ontology/ISO/EuropeanJurisdiction/SubstancesProductsOrganisationsReferentials/>
 PREFIX rdf:         <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 PREFIX rdfs:        <http://www.w3.org/2000/01/rdf-schema#>
 
@@ -21,12 +22,15 @@ WHERE {
         BIND( uc3_cq3_parameter_1  AS $SPORRMSId)
 
         # Find Medicinal Product that is approved for the Route of Administration having SPORRMSID
-		?SPORRMSIdentifier a idmp-eura:SPOR-ReferentialsManagementSystemIdentifier;
+		?SPORRMSIdentifier a idmp-spor:SPORTermIdentifier;
 			cmns-txt:hasTextValue $SPORRMSId . 
 
-		?RouteOfAdministration a idmp-mprd:RouteOfAdministration;
-			rdfs:label ?RouteOfAdminstrationLabel ;
-			cmns-id:isIdentifiedBy ?SPORRMSIdentifier .
+		?RouteOfAdministration a idmp-spor:SPOR-RouteOfAdministration;
+		    idmp-spor:hasSPORTermName   ?RouteOfAdministrationTermName;
+			cmns-id:isIdentifiedBy      ?SPORRMSIdentifier .
+
+		?RouteOfAdministrationTermName a idmp-spor:SPORTermName;
+		    cmns-txt:hasTextValue ?RouteOfAdminstrationLabel .
 
 		?PharmaceuticalProduct idmp-mprd:hasRouteOfAdministration ?RouteOfAdministration ;
 		    ^cmns-col:comprises ?MedicinalProduct .