Merge branch 'main' into refactor/useless-trait

dasch-swiss · Apr 24, 2024 · 0a1ddb3 · 0a1ddb3
2 parents e8d9a82 + c17e7f8
commit 0a1ddb3
Show file tree

Hide file tree

Showing 6 changed files with 220 additions and 2 deletions.
diff --git a/docs/03-endpoints/api-v2/text/standard-standoff.md b/docs/03-endpoints/api-v2/text/standard-standoff.md
@@ -30,8 +30,10 @@ that are mapped to standoff classes and properties defined in the ontology:
 - `<ul>` → `standoff:StandoffUnrderedListTag`
 - `<li>` → `standoff:StandoffListElementTag`
 - `<tbody>` → `standoff:StandoffTableBodyTag`
+- `<thead>` → `standoff:StandoffTableHeaderTag`
 - `<table>` → `standoff:StandoffTableTag`
 - `<tr>` → `standoff:StandoffTableRowTag`
+- `<th>` → `standoff:StandoffTableHeaderCellTag`
 - `<td>` → `standoff:StandoffTableCellTag`
 - `<br>` → `standoff:StandoffBrTag`
 - `<hr>` → `standoff:StandoffLineTag`

diff --git a/test_data/generated_test_data/ontologyR2RV2/standoffOntologyWithValueObjects.jsonld b/test_data/generated_test_data/ontologyR2RV2/standoffOntologyWithValueObjects.jsonld
@@ -2298,6 +2298,188 @@
             "@type": "owl:Class",
             "@id": "standoff:StandoffTableCellTag"
         },
+        {
+            "knora-api:isStandoffClass": true,
+            "rdfs:subClassOf": [
+                {
+                    "@id": "standoff:StandoffStructuralTag"
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasEnd"
+                    },
+                    "owl:cardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasEndIndex"
+                    },
+                    "owl:maxCardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasEndParent"
+                    },
+                    "owl:maxCardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasEndParentIndex"
+                    },
+                    "owl:maxCardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasOriginalXMLID"
+                    },
+                    "owl:maxCardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasStart"
+                    },
+                    "owl:cardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasStartIndex"
+                    },
+                    "owl:cardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasStartParent"
+                    },
+                    "owl:maxCardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasStartParentIndex"
+                    },
+                    "owl:maxCardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasUUID"
+                    },
+                    "owl:cardinality": 1,
+                    "knora-api:isInherited": true
+                }
+            ],
+            "rdfs:comment": "Represents a cell in a header row in a table",
+            "@type": "owl:Class",
+            "@id": "standoff:StandoffTableHeaderCellTag"
+        },
+        {
+            "knora-api:isStandoffClass": true,
+            "rdfs:subClassOf": [
+                {
+                    "@id": "standoff:StandoffStructuralTag"
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasEnd"
+                    },
+                    "owl:cardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasEndIndex"
+                    },
+                    "owl:maxCardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasEndParent"
+                    },
+                    "owl:maxCardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasEndParentIndex"
+                    },
+                    "owl:maxCardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasOriginalXMLID"
+                    },
+                    "owl:maxCardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasStart"
+                    },
+                    "owl:cardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasStartIndex"
+                    },
+                    "owl:cardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasStartParent"
+                    },
+                    "owl:maxCardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasStartParentIndex"
+                    },
+                    "owl:maxCardinality": 1,
+                    "knora-api:isInherited": true
+                },
+                {
+                    "@type": "owl:Restriction",
+                    "owl:onProperty": {
+                        "@id": "knora-api:standoffTagHasUUID"
+                    },
+                    "owl:cardinality": 1,
+                    "knora-api:isInherited": true
+                }
+            ],
+            "rdfs:comment": "Represents a table header in a TextValue",
+            "@type": "owl:Class",
+            "@id": "standoff:StandoffTableHeaderTag"
+        },
         {
             "knora-api:isStandoffClass": true,
             "rdfs:subClassOf": [

diff --git a/webapi/src/main/resources/knora-ontologies/knora-base.ttl b/webapi/src/main/resources/knora-ontologies/knora-base.ttl
@@ -20,7 +20,7 @@
     rdf:type           owl:Ontology ;
     rdfs:label         "The Knora base ontology"@en ;
     :attachedToProject knora-admin:SystemProject ;
-    :ontologyVersion   "knora-base v36" .
+    :ontologyVersion   "knora-base v37" .
 
 
 #################################################################

diff --git a/webapi/src/main/resources/knora-ontologies/standoff-data.ttl b/webapi/src/main/resources/knora-ontologies/standoff-data.ttl
@@ -41,8 +41,10 @@
                                  <http://rdfh.ch/standoff/mappings/StandardMapping/elements/uJ4GgFl_Qki-cYHae_nAtA>,
                                  <http://rdfh.ch/standoff/mappings/StandardMapping/elements/X-SQznMkTx-LZRLAY74ePA>,
                                  <http://rdfh.ch/standoff/mappings/StandardMapping/elements/62844c98-7251-11e7-8cf>,
+                                 <http://rdfh.ch/standoff/mappings/StandardMapping/elements/2tO9l7IZSEKktbCPWc2Enw>,
                                  <http://rdfh.ch/standoff/mappings/StandardMapping/elements/_-8MPxJFSAiZm1T-g3Ymzg>,
                                  <http://rdfh.ch/standoff/mappings/StandardMapping/elements/vlGCAF3kQyywpobNu1T7ng>,
+                                 <http://rdfh.ch/standoff/mappings/StandardMapping/elements/CFGtLwdXQyGdVpMyfB9Leg>,
                                  <http://rdfh.ch/standoff/mappings/StandardMapping/elements/ktOIwFHSTm-GC1RVF3HZpw>,
                                  <http://rdfh.ch/standoff/mappings/StandardMapping/elements/ZeSrjYCxT-anWm8YYy61Uw>,
                                  <http://rdfh.ch/standoff/mappings/StandardMapping/elements/a05L2z3NT3iMWMn7nFqIOA>,
@@ -254,6 +256,14 @@
     knora-base:mappingElementRequiresSeparator true ;
     knora-base:mappingHasXMLTagname            "tbody"^^xsd:string .
 
+<http://rdfh.ch/standoff/mappings/StandardMapping/elements/2tO9l7IZSEKktbCPWc2Enw>
+    a                                          knora-base:MappingElement ;
+    knora-base:mappingHasStandoffClass         standoff:StandoffTableHeaderTag ;
+    knora-base:mappingHasXMLClass              "noClass"^^xsd:string ;
+    knora-base:mappingHasXMLNamespace          "noNamespace"^^xsd:string ;
+    knora-base:mappingElementRequiresSeparator true ;
+    knora-base:mappingHasXMLTagname            "thead"^^xsd:string .
+
 <http://rdfh.ch/standoff/mappings/StandardMapping/elements/_-8MPxJFSAiZm1T-g3Ymzg>
     a                                          knora-base:MappingElement ;
     knora-base:mappingHasStandoffClass         standoff:StandoffTableRowTag ;
@@ -270,6 +280,14 @@
     knora-base:mappingElementRequiresSeparator true ;
     knora-base:mappingHasXMLTagname            "td"^^xsd:string .
 
+<http://rdfh.ch/standoff/mappings/StandardMapping/elements/CFGtLwdXQyGdVpMyfB9Leg>
+    a                                          knora-base:MappingElement ;
+    knora-base:mappingHasStandoffClass         standoff:StandoffTableHeaderCellTag ;
+    knora-base:mappingHasXMLClass              "noClass"^^xsd:string ;
+    knora-base:mappingHasXMLNamespace          "noNamespace"^^xsd:string ;
+    knora-base:mappingElementRequiresSeparator true ;
+    knora-base:mappingHasXMLTagname            "th"^^xsd:string .
+
 <http://rdfh.ch/standoff/mappings/StandardMapping/elements/ktOIwFHSTm-GC1RVF3HZpw>
     a                                          knora-base:MappingElement ;
     knora-base:mappingHasStandoffClass         standoff:StandoffBrTag ;

diff --git a/webapi/src/main/resources/knora-ontologies/standoff-onto.ttl b/webapi/src/main/resources/knora-ontologies/standoff-onto.ttl
@@ -193,6 +193,14 @@
     rdfs:comment    "Represents a list element in a TextValue"@en .
 
 
+###  http://www.knora.org/ontology/standoff#StandoffTableBodyTag
+
+:StandoffTableHeaderTag
+    rdf:type        owl:Class ;
+    rdfs:subClassOf :StandoffStructuralTag ;
+    rdfs:comment    "Represents a table header in a TextValue"@en .
+
+
 ###  http://www.knora.org/ontology/standoff#StandoffTableBodyTag
 
 :StandoffTableBodyTag
@@ -225,6 +233,14 @@
     rdfs:comment    "Represents a cell in a table"@en .
 
 
+###  http://www.knora.org/ontology/standoff#StandoffTableHeaderCellTag
+
+:StandoffTableHeaderCellTag
+    rdf:type        owl:Class ;
+    rdfs:subClassOf :StandoffStructuralTag ;
+    rdfs:comment    "Represents a cell in a header row in a table"@en .
+
+
 ###  http://www.knora.org/ontology/standoff#StandoffBrTag
 
 :StandoffBrTag

diff --git a/webapi/src/main/scala/org/knora/webapi/package.scala b/webapi/src/main/scala/org/knora/webapi/package.scala
@@ -11,7 +11,7 @@ package object webapi {
    * The version of `knora-base` and of the other built-in ontologies that this version of Knora requires.
    * Must be the same as the object of `knora-base:ontologyVersion` in the `knora-base` ontology being used.
    */
-  val KnoraBaseVersion: String = "knora-base v36"
+  val KnoraBaseVersion: String = "knora-base v37"
 
   /**
    * `IRI` is a synonym for `String`, used to improve code readability.