GH-315: fix mapping agentschap Digitaal Vlaanderen + bump version

Fedict · Jan 15, 2025 · 24bdd78 · 24bdd78
1 parent e390030
commit 24bdd78
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Various DCAT tools for harvesting metadata from Belgian open data portals,
 converting metadata to DCAT-AP files and updating the Belgian 
 [data.gov.be](http://data.gov.be) portal.
 
-The portal itself is a Drupal 9 website, based on Fedict's 
+The portal itself is a Drupal 9 website, based on Fedict's / BOSA's
 [Openfed](https://drupal.org/project/openfed) distribution.
 
 ## Data

diff --git a/dcatlib/pom.xml b/dcatlib/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>be.gov.data</groupId>
         <artifactId>dcattools</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2</version>
     </parent>
     <artifactId>dcatlib</artifactId>
     <packaging>jar</packaging>

diff --git a/helpers/pom.xml b/helpers/pom.xml
@@ -4,9 +4,9 @@
 	<parent>
 		<groupId>be.gov.data</groupId>
 		<artifactId>dcattools</artifactId>
-		<version>4.0.1</version>
+		<version>4.0.2</version>
 	</parent>
-	<version>4.0.1</version>
+	<version>4.0.2</version>
 	<name>helpers</name>
 	<artifactId>helpers</artifactId>
 	<packaging>jar</packaging>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>be.gov.data</groupId>
     <artifactId>dcattools</artifactId>
-    <version>4.0.1</version>
+    <version>4.0.2</version>
     <packaging>pom</packaging>
 	<url>https://data.gov.be</url>
 	<licenses>

diff --git a/scrapers/pom.xml b/scrapers/pom.xml
@@ -4,9 +4,9 @@
     <parent>
         <groupId>be.gov.data</groupId>
         <artifactId>dcattools</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2</version>
     </parent>
-    <version>4.0.1</version>
+    <version>4.0.2</version>
     <name>scrapers</name>
     <description>Various scrapers for Belgian data portals</description>
     <artifactId>scrapers</artifactId>

diff --git a/scrapers/src/main/resources/be/gov/data/scrapers/vlaanderen/data-org.ttl b/scrapers/src/main/resources/be/gov/data/scrapers/vlaanderen/data-org.ttl
@@ -44,7 +44,7 @@
 <https://org.belgif.be/id/CbeRegisteredEntity/0216173309>
 	a foaf:Organization ;
 	dcterms:type admsp:RegionalAuthority ;
-	skos:closeMatch <https://data.vlaanderen.be/id/organisatie/OVO000112> ;
+	skos:closeMatch <https://data.vlaanderen.be/id/organisatie/OVO000112>, <https://data.vlaanderen.be/doc/organisatie/OVO000112> ;
 	skos:prefLabel "Vlaamse Waterweg NV"@nl ;
 	skos:altLabel "Vlaamse Waterweg NV"@nl  .
 
@@ -126,7 +126,7 @@
 <https://org.belgif.be/id/CbeEstablishmentUnit/2199323857>
 	a foaf:Organization ;
 	dcterms:type admsp:RegionalAuthority ;
-	skos:closeMatch <https://data.vlaanderen.be/id/organisatie/OVO000076> ;
+	skos:closeMatch <https://data.vlaanderen.be/id/organisatie/OVO000076>, <https://data.vlaanderen.be/id/organisatie/OVO053580> ;
 	skos:prefLabel "Departement Werk en Sociale Economie"@nl ;
 	skos:altLabel "DWSE", "DWSE"@nl .
 

diff --git a/scrapers/src/main/resources/be/gov/data/scrapers/vlaanderen/scripts.txt b/scrapers/src/main/resources/be/gov/data/scrapers/vlaanderen/scripts.txt
@@ -63,6 +63,7 @@ clear-skos.qry
 # Departement Omgeving
 vlaanderen/sparql-deptomgeving-org.qry
 vlaanderen/sparql-deptomgeving-name.qry
+vlaanderen/sparql-contact-publisher.qry
 vlaanderen/data-org.ttl
 vlaanderen/sparql-map-org-simple.qry
 vlaanderen/sparql-map-org-ovo.qry

diff --git a/scrapers/src/main/resources/be/gov/data/scrapers/vlaanderen/sparql-contact-publisher.qry b/scrapers/src/main/resources/be/gov/data/scrapers/vlaanderen/sparql-contact-publisher.qry
@@ -0,0 +1,13 @@
+# Use contactpoint if publisher is missing
+
+PREFIX dcterms: <http://purl.org/dc/terms/>
+PREFIX dcat: <http://www.w3.org/ns/dcat#>
+
+INSERT 
+	{ 	?dataset dcterms:publisher ?contact }
+WHERE
+	{	?dataset dcat:contactPoint ?contact
+		FILTER NOT EXISTS {
+			?dataset dcterms:publisher ?publ
+		}
+	}
diff --git a/tools/pom.xml b/tools/pom.xml
@@ -4,10 +4,10 @@
 	<parent>
 		<groupId>be.gov.data</groupId>
 		<artifactId>dcattools</artifactId>
-		<version>4.0.1</version>
+		<version>4.0.2</version>
 	</parent>
 	<name>tools</name>
-	<version>4.0.1</version>
+	<version>4.0.2</version>
 	<description>Misc tools for enhancing DCAT metadata</description>
 	<artifactId>tools</artifactId>
 	<packaging>jar</packaging>

diff --git a/translater/pom.xml b/translater/pom.xml
@@ -4,9 +4,9 @@
     <parent>
         <groupId>be.gov.data</groupId>
         <artifactId>dcattools</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2</version>
     </parent>
-    <version>4.0.1</version>
+    <version>4.0.2</version>
     <name>translater</name>
     <description>Translation client to machine-translation service</description>
     <artifactId>translater</artifactId>

diff --git a/uploaderd10/pom.xml b/uploaderd10/pom.xml
@@ -4,9 +4,9 @@
     <parent>
         <groupId>be.gov.data</groupId>
         <artifactId>dcattools</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2</version>
     </parent>
-    <version>4.0.1</version>
+    <version>4.0.2</version>
     <artifactId>uploaderd10</artifactId>
     <packaging>jar</packaging>
     <properties>