fix: Split back publisher validation to check it for foaf:Organization

opendata-swiss · Feb 19, 2024 · 407db46 · 407db46
1 parent 11dd226
commit 407db46
Showing 1 changed file with 12 additions and 17 deletions.
diff --git a/ogdch.shacl.ttl b/ogdch.shacl.ttl
@@ -87,32 +87,27 @@
         See https://handbook.opendata.swiss/de/content/glossar/bibliothek/dcat-ap-ch.html#dcat-contactpoint-dcat
 	    """@en ;
   ] ;
-  sh:property [
+ sh:property [
       sh:path dct:publisher ;   # mandatory property
+      sh:class foaf:Organization ;
+      sh:severity sh:Violation ;
+      sh:message """The publisher needs to be provided as foaf:Organization.
+        See https://handbook.opendata.swiss/content/glossar/bibliothek/dcat-ap-ch.html#dcat-dataset-publisher
+	    """@en ;
+  ] ;
+  sh:property [
+      sh:path dct:publisher ;
       sh:minCount 1 ;
       sh:severity sh:Violation ;
-      sh:message """This dataset does not provide a publisher. Please add a publisher for the dataset.
+      sh:message """Please provide a publisher for the dataset.
         See https://handbook.opendata.swiss/content/glossar/bibliothek/dcat-ap-ch.html#dcat-dataset-publisher
 	    """@en ;
   ] ;
   sh:property [
       sh:path dct:publisher ;
-      sh:class foaf:Organization ;
-      sh:node [
-        sh:property [
-            sh:path rdf:about ;
-            sh:minCount 1 ;
-            sh:maxCount 1 ;
-        ] ;
-        sh:property [
-            sh:path foaf:name ;
-            sh:nodeKind sh:Literal ;
-            sh:minCount 1 ;
-            sh:maxCount 1 ;
-        ] ;
-      ] ;
+      sh:maxCount 1 ;
       sh:severity sh:Warning ;
-      sh:message """Ensure that there is only one valid publisher specified for the dataset, provided as foaf:Organization.
+      sh:message """Please provide only one publisher for the dataset.
         See https://handbook.opendata.swiss/content/glossar/bibliothek/dcat-ap-ch.html#dcat-dataset-publisher
         for Details on this change."""@en ;
   ] ;