Units import bug and redirection fixed

emmo-repo · Jul 20, 2023 · b6d3676 · b6d3676
1 parent f34ee03
commit b6d3676
Show file tree

Hide file tree

Showing 18 changed files with 74 additions and 74 deletions.
diff --git a/catalog-v001.xml b/catalog-v001.xml
@@ -33,14 +33,14 @@
         <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/metrology"           uri="./disciplines/metrology.ttl"/>
         <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/isq"                 uri="./disciplines/isq.ttl"/>
 
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/sisystem"            uri="./disciplines/units/sisystem.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/sidimensionalunits"  uri="./disciplines/units/sidimensionalunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/siunits"             uri="./disciplines/units/siunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/coherentsiunits"     uri="./disciplines/units/coherentsiunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/noncoherentsiunits"  uri="./disciplines/units/noncoherentsiunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/prefixedsiunits"     uri="./disciplines/units/prefixedsiunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/siacceptedunits"     uri="./disciplines/units/siacceptedunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/unclassifiedunits"   uri="./disciplines/units/unclassifiedunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/sisystem"            uri="./disciplines/sisystem.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/sidimensionalunits"  uri="./disciplines/units/sidimensionalunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siunits"             uri="./disciplines/units/siunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/coherentsiunits"     uri="./disciplines/units/coherentsiunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/noncoherentsiunits"  uri="./disciplines/units/noncoherentsiunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/prefixedsiunits"     uri="./disciplines/units/prefixedsiunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siacceptedunits"     uri="./disciplines/units/siacceptedunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/unclassifiedunits"   uri="./disciplines/units/unclassifiedunits.ttl"/>
 
         <!-- to be removed -->
         <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/unitsextension"      uri="./disciplines/units/unitsextension.ttl"/>

diff --git a/disciplines/catalog-v001.xml b/disciplines/catalog-v001.xml
@@ -34,14 +34,14 @@
         <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/metrology"           uri="../disciplines/metrology.ttl"/>
         <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/isq"                 uri="../disciplines/isq.ttl"/>
 
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/sysystem"            uri="../disciplines/units/sisystem.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/sidimensionalunits"  uri="../disciplines/units/sidimensionalunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/siunits"             uri="../disciplines/units/siunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/coherentsiunits"     uri="../disciplines/units/coherentsiunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/noncoherentsiunits"  uri="../disciplines/units/noncoherentsiunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/prefixedsiunits"     uri="../disciplines/units/prefixedsiunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/siacceptedunits"     uri="../disciplines/units/siacceptedunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/unclassifiedunits"   uri="../disciplines/units/unclassifiedunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/sysystem"            uri="../disciplines/sisystem.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/sidimensionalunits"  uri="../disciplines/units/sidimensionalunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siunits"             uri="../disciplines/units/siunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/coherentsiunits"     uri="../disciplines/units/coherentsiunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/noncoherentsiunits"  uri="../disciplines/units/noncoherentsiunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/prefixedsiunits"     uri="../disciplines/units/prefixedsiunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siacceptedunits"     uri="../disciplines/units/siacceptedunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/unclassifiedunits"   uri="../disciplines/units/unclassifiedunits.ttl"/>
 
         <!-- to be removed -->
         <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/unitsextension"      uri="../disciplines/units/unitsextension.ttl"/>

diff --git a/disciplines/disciplines.ttl b/disciplines/disciplines.ttl
@@ -23,15 +23,15 @@
                                                 <http://emmo.info/emmo/1.0.0-beta5/disciplines/sisystem> .
 
 # Imported vis sisystem
-#                                                <http://emmo.info/emmo/1.0.0-beta5/disciplines/sidimensionalunits> ,
-#                                                <http://emmo.info/emmo/1.0.0-beta5/disciplines/siunits> ,
-#                                                <http://emmo.info/emmo/1.0.0-beta5/disciplines/coherentsiunits> ,
-#                                                <http://emmo.info/emmo/1.0.0-beta5/disciplines/noncoherentsiunits> ,
+#                                                <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/sidimensionalunits> ,
+#                                                <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siunits> ,
+#                                                <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/coherentsiunits> ,
+#                                                <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/noncoherentsiunits> ,
 
 # Currently not imported by default
-#                                                <http://emmo.info/emmo/1.0.0-beta5/disciplines/prefixedsiunits> ,
-#                                                <http://emmo.info/emmo/1.0.0-beta5/disciplines/siacceptedunits> ,
-#                                                <http://emmo.info/emmo/1.0.0-beta5/disciplines/unclassifiedunits> ,
+#                                                <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/prefixedsiunits> ,
+#                                                <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siacceptedunits> ,
+#                                                <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/unclassifiedunits> ,
 
 
 # To be removed

diff --git a/disciplines/isq.ttl b/disciplines/isq.ttl
@@ -11,7 +11,7 @@
 <http://emmo.info/emmo/disciplines/isq> rdf:type owl:Ontology ;
                                          owl:versionIRI <http://emmo.info/emmo/1.0.0-beta5/disciplines/isq> ;
                                          owl:imports <http://emmo.info/emmo/1.0.0-beta5/disciplines/materials> ,
-                                                     <http://emmo.info/emmo/1.0.0-beta5/disciplines/sidimensionalunits> ,
+                                                     <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/sidimensionalunits> ,
                                                      <http://emmo.info/emmo/1.0.0-beta5/multiperspective/symbolic> ;
                                          dcterms:abstract """Defines physical quantities in the International System of Quantities (ISQ). ISQ was made an official ISO standard in 2009 and is defined in the ISO/IEC 80000 standard.
 

diff --git a/disciplines/units/sisystem.ttl → disciplines/sisystem.ttl b/disciplines/units/sisystem.ttl → disciplines/sisystem.ttl
@@ -10,10 +10,10 @@
 
 <http://emmo.info/emmo/disciplines/sisystem> rdf:type owl:Ontology ;
                                               owl:versionIRI <http://emmo.info/emmo/1.0.0-beta5/disciplines/sisystem> ;
-                                              owl:imports <http://emmo.info/emmo/1.0.0-beta5/disciplines/coherentsiunits> ,
-                                                          <http://emmo.info/emmo/1.0.0-beta5/disciplines/noncoherentsiunits> ,
-                                                          <http://emmo.info/emmo/1.0.0-beta5/disciplines/prefixedsiunits> ,
-                                                          <http://emmo.info/emmo/1.0.0-beta5/disciplines/siacceptedunits> ,
-                                                          <http://emmo.info/emmo/1.0.0-beta5/disciplines/sidimensionalunits> .
+                                              owl:imports <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/coherentsiunits> ,
+                                                          <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/noncoherentsiunits> ,
+                                                          <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/prefixedsiunits> ,
+                                                          <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siacceptedunits> ,
+                                                          <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/sidimensionalunits> .
 
 ###  Generated by the OWL API (version 4.5.25.2023-02-15T19:15:49Z) https://github.com/owlcs/owlapi
diff --git a/disciplines/units/catalog-v001.xml b/disciplines/units/catalog-v001.xml
@@ -34,14 +34,14 @@
         <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/metrology"           uri="../../disciplines/metrology.ttl"/>
         <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/isq"                 uri="../../disciplines/isq.ttl"/>
 
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/sisystem"            uri="../../disciplines/units/sisystem.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/sidimensionalunits"  uri="../../disciplines/units/sidimensionalunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/siunits"             uri="../../disciplines/units/siunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/coherentsiunits"     uri="../../disciplines/units/coherentsiunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/noncoherentsiunits"  uri="../../disciplines/units/noncoherentsiunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/prefixedsiunits"     uri="../../disciplines/units/prefixedsiunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/siacceptedunits"     uri="../../disciplines/units/siacceptedunits.ttl"/>
-        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/unclassifiedunits"   uri="../../disciplines/units/unclassifiedunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/sisystem"                  uri="../../disciplines/sisystem.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/sidimensionalunits"  uri="../../disciplines/units/sidimensionalunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siunits"             uri="../../disciplines/units/siunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/coherentsiunits"     uri="../../disciplines/units/coherentsiunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/noncoherentsiunits"  uri="../../disciplines/units/noncoherentsiunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/prefixedsiunits"     uri="../../disciplines/units/prefixedsiunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siacceptedunits"     uri="../../disciplines/units/siacceptedunits.ttl"/>
+        <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/units/unclassifiedunits"   uri="../../disciplines/units/unclassifiedunits.ttl"/>
 
         <!-- to be removed -->
         <uri name="http://emmo.info/emmo/1.0.0-beta5/disciplines/unitsextension"      uri="../../disciplines/units/unitsextension.ttl"/>

diff --git a/disciplines/units/coherentsiunits.ttl b/disciplines/units/coherentsiunits.ttl
@@ -1,4 +1,4 @@
-@prefix : <http://emmo.info/emmo/disciplines/coherentsiunits#> .
+@prefix : <http://emmo.info/emmo/disciplines/units/coherentsiunits#> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
@@ -7,11 +7,11 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix skos: <http://www.w3.org/2004/02/skos/core#> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
-@base <http://emmo.info/emmo/disciplines/coherentsiunits#> .
+@base <http://emmo.info/emmo/disciplines/units/coherentsiunits#> .
 
-<http://emmo.info/emmo/disciplines/coherentsiunits> rdf:type owl:Ontology ;
-                                                     owl:versionIRI <http://emmo.info/emmo/1.0.0-beta5/disciplines/coherentsiunits> ;
-                                                     owl:imports <http://emmo.info/emmo/1.0.0-beta5/disciplines/siunits> ;
+<http://emmo.info/emmo/disciplines/units/coherentsiunits> rdf:type owl:Ontology ;
+                                                     owl:versionIRI <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/coherentsiunits> ;
+                                                     owl:imports <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siunits> ;
                                                      dcterms:abstract "The module 'coherentsiunits' contain coherent derived SI units.  For each physical dimensionality there exists one and only one coherent derived SI unit.  Examples of such units are m/s, Pa·m, etc..."@en ;
                                                      dcterms:contributor "Adham Hashibon, Fraunhofer IWM (DE)" ,
                                                                          "Francesca L. Bleken, SINTEF (NO)" ,

diff --git a/disciplines/units/deprecated.ttl b/disciplines/units/deprecated.ttl
@@ -10,7 +10,7 @@
 
 <http://emmo.info/emmo/disciplines/deprecated> rdf:type owl:Ontology ;
                                                 owl:versionIRI <http://emmo.info/emmo/1.0.0-beta5/disciplines/deprecated> ;
-                                                owl:imports <http://emmo.info/emmo/1.0.0-beta5/disciplines/sidimensionalunits> ,
+                                                owl:imports <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/sidimensionalunits> ,
                                                             <http://emmo.info/emmo/1.0.0-beta5/disciplines/prefixedunits> ;
                                                 dcterms:abstract "This module contains deprecated IRIs with references."@en ;
                                                 dcterms:contributor "Gerhard Goldbeck, Boldbeck Consulting Ltd (UK)" ;

diff --git a/disciplines/units/noncoherentsiunits.ttl b/disciplines/units/noncoherentsiunits.ttl
@@ -9,9 +9,9 @@
 @prefix dcterms: <http://purl.org/dc/terms/> .
 @base <http://emmo.info/emmo#> .
 
-<http://emmo.info/emmo/disciplines/noncoherentsiunits> rdf:type owl:Ontology ;
-                                                        owl:versionIRI <http://emmo.info/emmo/1.0.0-beta5/disciplines/noncoherentsiunits> ;
-                                                        owl:imports <http://emmo.info/emmo/1.0.0-beta5/disciplines/siunits> ;
+<http://emmo.info/emmo/disciplines/units/noncoherentsiunits> rdf:type owl:Ontology ;
+                                                        owl:versionIRI <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/noncoherentsiunits> ;
+                                                        owl:imports <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siunits> ;
                                                         dcterms:abstract "The 'noncoherentsiunits' module contains non-coherent SI derived units.  This include ."@en ;
                                                         dcterms:contributor "Adham Hashibon, Fraunhofer IWM (DE)" ,
                                                                             "Francesca L. Bleken, SINTEF (NO)" ,

diff --git a/disciplines/units/prefixedsiunits.ttl b/disciplines/units/prefixedsiunits.ttl
@@ -7,11 +7,11 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix skos: <http://www.w3.org/2004/02/skos/core#> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
-@base <http://emmo.info/emmo/disciplines/prefixedsiunits> .
+@base <http://emmo.info/emmo/disciplines/units/prefixedsiunits> .
 
-<http://emmo.info/emmo/disciplines/prefixedsiunits> rdf:type owl:Ontology ;
-                                                    owl:versionIRI <http://emmo.info/emmo/1.0.0-beta5/disciplines/prefixedsiunits> ;
-                                                    owl:imports <http://emmo.info/emmo/1.0.0-beta5/disciplines/siunits> ;
+<http://emmo.info/emmo/disciplines/units/prefixedsiunits> rdf:type owl:Ontology ;
+                                                    owl:versionIRI <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/prefixedsiunits> ;
+                                                    owl:imports <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siunits> ;
                                                     dcterms:abstract "The module 'prefixedsiunits' contains prefixed SI units, like km, ms, MPa, etc..."@en ;
                                                     dcterms:contributor "Adham Hashibon, Fraunhofer IWM (DE)" ,
                                                                         "Francesca L. Bleken, SINTEF (NO)" ,

diff --git a/disciplines/units/prefixedunits.ttl b/disciplines/units/prefixedunits.ttl
@@ -12,10 +12,10 @@
 <http://emmo.info/emmo/disciplines/prefixedunits> rdf:type owl:Ontology ;
                                                    owl:versionIRI <http://emmo.info/emmo/1.0.0-beta5/disciplines/prefixedunits> ;
     owl:imports <http://emmo.info/emmo/1.0.0-beta5/disciplines/unitsextension> ,
-    <http://emmo.info/emmo/1.0.0-beta5/disciplines/coherentsiunits> ,
-    <http://emmo.info/emmo/1.0.0-beta5/disciplines/noncoherentsiunits> ,
-    <http://emmo.info/emmo/1.0.0-beta5/disciplines/prefixedsiunits> ,
-    <http://emmo.info/emmo/1.0.0-beta5/disciplines/siacceptedunits> ;
+    <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/coherentsiunits> ,
+    <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/noncoherentsiunits> ,
+    <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/prefixedsiunits> ,
+    <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siacceptedunits> ;
                                                    dcterms:abstract "This module contains prefixed units."@en ;
                                                    dcterms:contributor "Gerhard Goldbeck, Boldbeck Consulting Ltd (UK)" ;
                                                    dcterms:creator "Emanuele Ghedini, University of Bologna (IT)" ,

diff --git a/disciplines/units/siacceptedunits.ttl b/disciplines/units/siacceptedunits.ttl
@@ -8,9 +8,9 @@
 @prefix dcterms: <http://purl.org/dc/terms/> .
 @base <http://emmo.info/emmo#> .
 
-<http://emmo.info/emmo/disciplines/siacceptedunits> rdf:type owl:Ontology ;
-                                                     owl:versionIRI <http://emmo.info/emmo/1.0.0-beta5/disciplines/siacceptedunits> ;
-                                                     owl:imports <http://emmo.info/emmo/1.0.0-beta5/disciplines/siunits> ;
+<http://emmo.info/emmo/disciplines/units/siacceptedunits> rdf:type owl:Ontology ;
+                                                     owl:versionIRI <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siacceptedunits> ;
+                                                     owl:imports <http://emmo.info/emmo/1.0.0-beta5/disciplines/units/siunits> ;
                                                      dcterms:abstract "The module 'siacceptedunits' include non-SI units that are accepted for use with the SI units as well as derived units constructed from SI and SI-accepted units."@en ;
                                                      dcterms:contributor "Adham Hashibon, Fraunhofer IWM (DE)" ,
                                                                          "Francesca L. Bleken, SINTEF (NO)" ,