Add zeroOrMorePath, oneOrMorePath, zeroOrOnePath SHACL. Convert prope…

…rty selection to UNION queries.
RDFLib · Sep 23, 2024 · ed17101 · ed17101
1 parent 9f045d5
commit ed17101
Show file tree

Hide file tree

Showing 11 changed files with 403 additions and 251 deletions.
diff --git a/prez/reference_data/endpoints/endpoint_nodeshapes.ttl b/prez/reference_data/endpoints/endpoint_nodeshapes.ttl
@@ -19,7 +19,6 @@ ex:Catalogs
     sh:property [
         sh:path dcterms:hasPart ;
         sh:or (
-            [ sh:class dcat:Resource ]
             [ sh:class skos:ConceptScheme ]
             [ sh:class skos:Collection ]
             [ sh:class dcat:Dataset ]
@@ -29,7 +28,7 @@ ex:Catalogs
 ex:Collections
     a sh:NodeShape ;
     ont:hierarchyLevel 2 ;
-    sh:targetClass skos:ConceptScheme , skos:Collection , dcat:Resource , dcat:Dataset ;
+    sh:targetClass skos:ConceptScheme , skos:Collection , dcat:Dataset ;
     sh:property [
         sh:path [ sh:inversePath dcterms:hasPart ] ;
         sh:class dcat:Catalog ;
@@ -63,10 +62,10 @@ ex:CollectionConcept
 ex:Resource
     a sh:NodeShape ;
     ont:hierarchyLevel 3 ;
-    sh:targetClass rdf:Resource ;
+    sh:targetClass geo:FeatureCollection ;
     sh:property [
         sh:path [ sh:inversePath dcterms:hasPart ] ;
-        sh:class dcat:Resource ;
+        sh:class dcat:Dataset ;
     ] , [
         sh:path ( [ sh:inversePath dcterms:hasPart ] [ sh:inversePath dcterms:hasPart ] );
         sh:class dcat:Catalog ;

diff --git a/prez/reference_data/profiles/ogc_records_profile.ttl b/prez/reference_data/profiles/ogc_records_profile.ttl
@@ -109,13 +109,7 @@ prez:OGCItemProfile
         ],
         [
             sh:maxCount 0 ;
-            sh:path
-                (
-                    sh:union (
-                                 dcterms:hasPart
-                                 rdfs:member
-                             )
-                )
+            sh:path dcterms:hasPart , rdfs:member ;
         ] ;
     shext:bnode-depth 2 ;
     altr-ext:constrainsClass
@@ -143,26 +137,17 @@ prez:OGCSchemesListProfile
         "text/turtle" ;
     altr-ext:hasDefaultResourceFormat "text/anot+turtle" ;
     altr-ext:constrainsClass skos:ConceptScheme ;
-    sh:property
-        [
-            sh:minCount 0 ;
-            sh:path dcterms:publisher ;
-        ],
-        [
-            sh:minCount 0 ;
-            sh:path reg:status ;
-        ],
-        [
-            sh:minCount 0 ;
-            sh:path ( prov:qualifiedDerivation prov:hadRole ) ;
-        ],
-        [
-            sh:minCount 0 ;
-            sh:path ( prov:qualifiedDerivation prov:entity ) ;
-        ],
-        [
-            sh:path rdf:type
-        ]
+    sh:property [
+        sh:path (
+            sh:union (
+                  rdf:type
+                  dcterms:publisher
+                  reg:status
+                  ( prov:qualifiedDerivation prov:hadRole )
+                  ( prov:qualifiedDerivation prov:entity )
+            )
+        )
+    ] ;
 .