Hotfix branch (#534)

* removed duplicated imports; removed at-voc-new refs; import core layer into modules; cross-module imports. * removed at-voc-new refs. * changed URIs for cpv and nuts.
OP-TED · Feb 9, 2024 · 1ed3e97 · 1ed3e97
1 parent 18abd7a
commit 1ed3e97
Show file tree

Hide file tree

Showing 50 changed files with 609 additions and 2,697 deletions.
diff --git a/glossary/ePO_combined_glossary.html b/glossary/ePO_combined_glossary.html
@@ -2401,7 +2401,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Attributes (datatype
                      <td>rdf:PlainLiteral [0..*]</td>
                   </tr>
                   <tr>
-                     <td>epo-ord:DeliveryAgreement<br>epo-ord:TaxInformation<br>cccev:InformationConcept<br>cccev:Requirement<br>cpov:ContactPoint<br>cv:Channel<br>epo:AgentInRole<br>epo:Document<br>epo:ElectronicSignature<br>epo:Fund<br>epo:NonDisclosureAgreementTerm<br>epo:SecurityClearanceTerm<br>epo:SubcontractingEstimate<br>epo:SubcontractTerm<br>epo:System<br>epo:Technique<br>epo:LotGroup<br>epo:ProcurementElement<br>epo:TenderGroup<br>epo-cat:Line<br>epo-cat:Item<br>epo-ful:TemperatureSpecification<br>epo-ful:TransportEquipment<br>epo-ful:ShipmentInformation<br></td>
+                     <td>epo-ord:DeliveryAgreement<br>epo-ord:TaxInformation<br>epo-ful:TemperatureSpecification<br>epo-ful:TransportEquipment<br>epo-ful:ShipmentInformation<br>cccev:InformationConcept<br>cccev:Requirement<br>cpov:ContactPoint<br>cv:Channel<br>epo:AgentInRole<br>epo:Document<br>epo:ElectronicSignature<br>epo:Fund<br>epo:NonDisclosureAgreementTerm<br>epo:SecurityClearanceTerm<br>epo:SubcontractingEstimate<br>epo:SubcontractTerm<br>epo:System<br>epo:Technique<br>epo:LotGroup<br>epo:ProcurementElement<br>epo:TenderGroup<br>epo-cat:Line<br>epo-cat:Item<br></td>
                      <td>dct:description</td>
                      <td>An account of the resource.
 
@@ -2452,8 +2452,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Attributes (datatype
                         Description may include but is not limited to: an abstract, a table of contents, a
                         graphical representation, or a free-text account of the resource.
 
-                        WG Approval 30/05/2023
-                         An account of the resource.
+                        WG Approval 30/05/2023 An account of the resource.
 
                         Additional Information:
                         Description may include but is not limited to: an abstract, a table of contents, a
@@ -2490,7 +2489,8 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Attributes (datatype
                         Description may include but is not limited to: an abstract, a table of contents, a
                         graphical representation, or a free-text account of the resource.
 
-                        WG Approval 30/05/2023 An account of the resource.
+                        WG Approval 30/05/2023
+                         An account of the resource.
 
                         Additional Information:
                         Description may include but is not limited to: an abstract, a table of contents, a
@@ -2508,8 +2508,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Attributes (datatype
                         Description may include but is not limited to: an abstract, a table of contents, a
                         graphical representation, or a free-text account of the resource.
 
-                        WG Approval 30/05/2023
-                         An account of the resource.
+                        WG Approval 30/05/2023 An account of the resource.
 
                         Additional Information:
                         Description may include but is not limited to: an abstract, a table of contents, a
@@ -2521,14 +2520,14 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Attributes (datatype
                         Description may include but is not limited to: an abstract, a table of contents, a
                         graphical representation, or a free-text account of the resource.
 
-                        WG Approval 30/05/2023
-                         An account of the resource.
+                        WG Approval 30/05/2023 An account of the resource.
 
                         Additional Information:
                         Description may include but is not limited to: an abstract, a table of contents, a
                         graphical representation, or a free-text account of the resource.
 
-                        WG Approval 30/05/2023 An account of the resource.
+                        WG Approval 30/05/2023
+                         An account of the resource.
 
                         Additional Information:
                         Description may include but is not limited to: an abstract, a table of contents, a
@@ -2540,7 +2539,8 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Attributes (datatype
                         Description may include but is not limited to: an abstract, a table of contents, a
                         graphical representation, or a free-text account of the resource.
 
-                        WG Approval 30/05/2023 An account of the resource.
+                        WG Approval 30/05/2023
+                         An account of the resource.
 
                         Additional Information:
                         Description may include but is not limited to: an abstract, a table of contents, a
@@ -2553,7 +2553,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Attributes (datatype
                         graphical representation, or a free-text account of the resource.
 
                         WG Approval 30/05/2023</td>
-                     <td>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [1..1]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..*]<br></td>
+                     <td>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [1..1]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..*]<br>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [0..1]<br></td>
                   </tr>
                   <tr>
                      <td>epo:Document</td>
@@ -5198,7 +5198,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                <tbody>
                   <tr>
                      <td>adms:identifier</td>
-                     <td>Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class. A unique identifier of the instance of the concept.
+                     <td>Links a resource to an adms:Identifier class.    Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class. A unique identifier of the instance of the concept.
 
                         Additional Information
 
@@ -5234,8 +5234,8 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                         the service provider or any other stakeholder.
 
                         WG Approval 12/11/2019
-                         Links a resource to an adms:Identifier class.    Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class.    Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class.</td>
-                     <td>cccev:InformationConcept -&gt; adms:Identifier [0..1]<br>cccev:Requirement -&gt; adms:Identifier [0..1]<br>dct:Location -&gt; adms:Identifier [0..1]<br>epo:Document -&gt; adms:Identifier [0..*]<br>epo:Fund -&gt; adms:Identifier [0..1]<br>epo:Project -&gt; adms:Identifier [0..1]<br>foaf:Agent -&gt; adms:Identifier [0..*]<br>epo:LotGroup -&gt; adms:Identifier [0..1]<br>epo:ProcurementElement -&gt; adms:Identifier [1]<br>epo:TenderGroup -&gt; adms:Identifier [0..1]<br>epo-ful:Consignment -&gt; adms:Identifier [0..1]<br>epo-ful:TransportEquipment -&gt; adms:Identifier [0..1]<br>epo-ful:ShipmentStage -&gt; adms:Identifier [0..1]<br>epo-ful:TransportEquipmentSeal -&gt; adms:Identifier [0..1]<br>epo-ful:ShipmentInformation -&gt; adms:Identifier [0..1]<br>epo-cat:Line -&gt; adms:Identifier [0..1]<br>epo-ful:AbstractContainer -&gt; adms:Identifier [0..1]<br>epo-cat:Line -&gt; adms:Identifier [0..1]<br>epo-ful:AbstractContainer -&gt; adms:Identifier [0..1]<br>epo-ful:TransportEquipmentSeal -&gt; adms:Identifier [0..1]<br>epo-ful:ShipmentStage -&gt; adms:Identifier [0..1]<br>epo-ful:TransportEquipment -&gt; adms:Identifier [0..1]<br>epo-ful:Consignment -&gt; adms:Identifier [0..1]<br>epo-ful:ShipmentInformation -&gt; adms:Identifier [0..1]<br></td>
+                         Links a resource to an adms:Identifier class.    Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class. Links a resource to an adms:Identifier class.</td>
+                     <td>epo-ful:AbstractContainer -&gt; adms:Identifier [0..1]<br>epo-ful:TransportEquipmentSeal -&gt; adms:Identifier [0..1]<br>epo-ful:ShipmentStage -&gt; adms:Identifier [0..1]<br>epo-ful:TransportEquipment -&gt; adms:Identifier [0..1]<br>epo-ful:Consignment -&gt; adms:Identifier [0..1]<br>epo-ful:ShipmentInformation -&gt; adms:Identifier [0..1]<br>cccev:InformationConcept -&gt; adms:Identifier [0..1]<br>cccev:Requirement -&gt; adms:Identifier [0..1]<br>dct:Location -&gt; adms:Identifier [0..1]<br>epo:Document -&gt; adms:Identifier [0..*]<br>epo:Fund -&gt; adms:Identifier [0..1]<br>epo:Project -&gt; adms:Identifier [0..1]<br>foaf:Agent -&gt; adms:Identifier [0..*]<br>epo:LotGroup -&gt; adms:Identifier [0..1]<br>epo:ProcurementElement -&gt; adms:Identifier [1]<br>epo:TenderGroup -&gt; adms:Identifier [0..1]<br>epo-ful:Consignment -&gt; adms:Identifier [0..1]<br>epo-ful:TransportEquipment -&gt; adms:Identifier [0..1]<br>epo-ful:ShipmentStage -&gt; adms:Identifier [0..1]<br>epo-ful:TransportEquipmentSeal -&gt; adms:Identifier [0..1]<br>epo-ful:ShipmentInformation -&gt; adms:Identifier [0..1]<br>epo-cat:Line -&gt; adms:Identifier [0..1]<br>epo-ful:AbstractContainer -&gt; adms:Identifier [0..1]<br>epo-cat:Line -&gt; adms:Identifier [0..1]<br></td>
                   </tr>
                   <tr>
                      <td>cccev:confidentialityLevelType</td>
@@ -7009,7 +7009,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                   <tr>
                      <td>epo:playedBy</td>
                      <td>   </td>
-                     <td>epo:AgentInRole -&gt; foaf:Agent [1]<br>epo:JuryMember -&gt; person:Person [0..1]<br>epo-ful:TransportMeansOperator -&gt; foaf:Person [0..1]<br>epo-ful:TransportMeansOperator -&gt; foaf:Person [0..1]<br></td>
+                     <td>epo-ful:TransportMeansOperator -&gt; foaf:Person [0..1]<br>epo:AgentInRole -&gt; foaf:Agent [1]<br>epo:JuryMember -&gt; person:Person [0..1]<br>epo-ful:TransportMeansOperator -&gt; foaf:Person [0..1]<br></td>
                   </tr>
                   <tr>
                      <td>epo:providesContractTotalPaymentValue</td>
@@ -7652,7 +7652,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                   <tr>
                      <td>epo-ful:hasAssociatedDocument</td>
                      <td>   </td>
-                     <td>epo-ful:DespatchAdvice -&gt; epo-cat:PostAwardDocument [0..1]<br>epo-ful:DespatchLine -&gt; epo-cat:PostAwardDocument [0..1]<br>epo-ful:DespatchLine -&gt; epo-cat:PostAwardDocument [0..1]<br>epo-ful:DespatchAdvice -&gt; epo-cat:PostAwardDocument [0..1]<br></td>
+                     <td>epo-ful:DespatchLine -&gt; epo-cat:PostAwardDocument [0..1]<br>epo-ful:DespatchAdvice -&gt; epo-cat:PostAwardDocument [0..1]<br>epo-ful:DespatchAdvice -&gt; epo-cat:PostAwardDocument [0..1]<br>epo-ful:DespatchLine -&gt; epo-cat:PostAwardDocument [0..1]<br></td>
                   </tr>
                   <tr>
                      <td>epo-ful:hasCarrierConsignmentID</td>

diff --git a/implementation/eCatalogue/conventions_report/eCatalogue_convention_report.html b/implementation/eCatalogue/conventions_report/eCatalogue_convention_report.html
@@ -19,7 +19,7 @@
    <body>
       <header class="counter-skip">
          <h1 class="title">UML Conventions Comformance Report</h1>
-         <h2>[ 09/11/2023 ]</h2>
+         <h2>[ 29/01/2024 ]</h2>
          <div class="authors col-span">
             <div class="author">
                <div>Publications Office of the European Union</div>
@@ -56,7 +56,7 @@ <h1>Abstract</h1>
                   Generalisations</em>. Each major section lists model items that need correction of errors
                or consideration of warnings.</p>
             <p>The UML model in file <em>eCatalogue.xml</em> 
-               was tested at 14:55 on November 9, 2023.</p>
+               was tested at 08:29 on January 29, 2024.</p>
          </div>
          <h1 xmlns:f="http://https://github.com/costezki/model2owl#" id="nomenclature">Nomenclature</h1>
          <h2 xmlns:f="http://https://github.com/costezki/model2owl#" id="classNames">Class names</h2>

diff --git a/implementation/eCatalogue/model2owl-config/config-parameters.xsl b/implementation/eCatalogue/model2owl-config/config-parameters.xsl
@@ -71,7 +71,7 @@
     <xsl:variable name="enableGenerationOfSkosConcept" select="fn:false()"/>
 
     <!--    This variable controls whether the enumerations are transformed into skos schemes or ignored-->
-    <xsl:variable name="enableGenerationOfConceptSchemes" select="fn:true()"/>
+    <xsl:variable name="enableGenerationOfConceptSchemes" select="fn:false()"/>
 
     <!--Allowed characters for a normalized string-->
     <xsl:variable name="allowedStrings" select="'^[\w\d-_:]+$'"/>
@@ -122,11 +122,11 @@
     <!--    owl:incompatibleWith -->
     <xsl:variable name="incompatibleWith" select="'3.1.0'"/>
     <!--    owl:versionInfo -->
-    <xsl:variable name="versionInfo" select="'4.0.0'"/>
+    <xsl:variable name="versionInfo" select="'4.0.1'"/>
     <!--    bibo:status-->
     <xsl:variable name="ontologyStatus" select="'Semantic Specification Release'"/>
     <!--    owl:priorVersion -->
-    <xsl:variable name="priorVersion" select="'3.1.0'"/>
+    <xsl:variable name="priorVersion" select="'4.0.0'"/>
     <!--    vann:preferredNamespaceUri -->
     <xsl:variable name="preferredNamespaceUri" select="'http://data.europa.eu/a4g/ontology#'"/>
     <!--    vann:preferredNamespacePrefix -->