From 6459f3dbaeff42c8cc387b2677d4f84e9f4a7c9d Mon Sep 17 00:00:00 2001
From: Egon Willighagen <egon.willighagen@gmail.com>
Date: Fri, 2 Aug 2024 09:06:55 +0200
Subject: [PATCH] Added some more expected info, see
 https://github.com/ejp-rd-vp/resource-metadata-schema/blob/master/shapes/dataservices.shex

---
 catalog/index.html              |  1 +
 catalog/index.ttl               |  1 +
 dataset/20240710/gmt/index.ttl  |  1 +
 dataset/20240710/gpml/index.ttl |  1 +
 dataset/20240710/index.ttl      |  1 +
 dataset/20240710/rdf/index.ttl  |  1 +
 fdp.template                    | 11 +++++++++--
 index.html                      | 12 ++++++++++--
 index.template                  | 26 --------------------------
 index.ttl                       | 12 ++++++++++--
 prefixes.template               |  1 +
 11 files changed, 36 insertions(+), 32 deletions(-)
 delete mode 100644 index.template

diff --git a/catalog/index.html b/catalog/index.html
index f2a86e1..0ef0074 100644
--- a/catalog/index.html
+++ b/catalog/index.html
@@ -5,6 +5,7 @@
 @prefix ldp:   <http://www.w3.org/ns/ldp#> .
 @prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix foaf:  <http://xmlns.com/foaf/0.1/> .
+@prefix ejprd: <https://w3id.org/ejp-rd/vocabulary#> .
 
 <https://fdp.wikipathways.org/catalog/index.ttl> a dcat:Catalog ;
   rdfs:label "WikiPathways Catalog" ;
diff --git a/catalog/index.ttl b/catalog/index.ttl
index f2a86e1..0ef0074 100644
--- a/catalog/index.ttl
+++ b/catalog/index.ttl
@@ -5,6 +5,7 @@
 @prefix ldp:   <http://www.w3.org/ns/ldp#> .
 @prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix foaf:  <http://xmlns.com/foaf/0.1/> .
+@prefix ejprd: <https://w3id.org/ejp-rd/vocabulary#> .
 
 <https://fdp.wikipathways.org/catalog/index.ttl> a dcat:Catalog ;
   rdfs:label "WikiPathways Catalog" ;
diff --git a/dataset/20240710/gmt/index.ttl b/dataset/20240710/gmt/index.ttl
index 6c73f81..eeafdbb 100644
--- a/dataset/20240710/gmt/index.ttl
+++ b/dataset/20240710/gmt/index.ttl
@@ -5,6 +5,7 @@
 @prefix ldp:   <http://www.w3.org/ns/ldp#> .
 @prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix foaf:  <http://xmlns.com/foaf/0.1/> .
+@prefix ejprd: <https://w3id.org/ejp-rd/vocabulary#> .
 
 <https://fdp.wikipathways.org/dataset/20240710/gmt/index.ttl> a dcat:Distribution ;
   dct:title "WikiPathways 20240710, GMT files" .
diff --git a/dataset/20240710/gpml/index.ttl b/dataset/20240710/gpml/index.ttl
index e8e0790..22f83b3 100644
--- a/dataset/20240710/gpml/index.ttl
+++ b/dataset/20240710/gpml/index.ttl
@@ -5,6 +5,7 @@
 @prefix ldp:   <http://www.w3.org/ns/ldp#> .
 @prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix foaf:  <http://xmlns.com/foaf/0.1/> .
+@prefix ejprd: <https://w3id.org/ejp-rd/vocabulary#> .
 
 <https://fdp.wikipathways.org/dataset/20240710/gpml/index.ttl> a dcat:Distribution ;
   dct:title "WikiPathways 20240710, GPML files" .
diff --git a/dataset/20240710/index.ttl b/dataset/20240710/index.ttl
index c10f9c0..372b520 100644
--- a/dataset/20240710/index.ttl
+++ b/dataset/20240710/index.ttl
@@ -5,6 +5,7 @@
 @prefix ldp:   <http://www.w3.org/ns/ldp#> .
 @prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix foaf:  <http://xmlns.com/foaf/0.1/> .
+@prefix ejprd: <https://w3id.org/ejp-rd/vocabulary#> .
 
 <https://fdp.wikipathways.org/dataset/20240710/index.ttl> a dcat:Dataset ;
   dct:title "WikiPathways 20240710" ;
diff --git a/dataset/20240710/rdf/index.ttl b/dataset/20240710/rdf/index.ttl
index b6a0750..aec7a50 100644
--- a/dataset/20240710/rdf/index.ttl
+++ b/dataset/20240710/rdf/index.ttl
@@ -5,6 +5,7 @@
 @prefix ldp:   <http://www.w3.org/ns/ldp#> .
 @prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix foaf:  <http://xmlns.com/foaf/0.1/> .
+@prefix ejprd: <https://w3id.org/ejp-rd/vocabulary#> .
 
 <https://fdp.wikipathways.org/dataset/20240710/rdf/index.ttl#wp> a dcat:Distribution ;
   dct:title "WikiPathways 20240710, WPRDF file" ;
diff --git a/fdp.template b/fdp.template
index 7bb44ee..c1892a1 100644
--- a/fdp.template
+++ b/fdp.template
@@ -1,11 +1,15 @@
 <https://fdp.wikipathways.org/index.ttl> a dcat:Resource, dcat:DataService, fdpo:MetadataService, fdpo:FairDataPoint ;
   rdfs:label "WikiPathways FAIR Data Point";
   dct:title "WikiPathways FAIR Data Point";
+  foaf:logo <https://upload.wikimedia.org/wikipedia/commons/8/83/Wplogo_with_text_500.png>;
+  dct:theme <http://vocabularies.wikipathways.org/wp#Pathway>;
   dct:conformsTo <https://www.purl.org/fairtools/fdp/schema/0.1/fdpMetadata>;
   dct:description "This FAIR Data Point deployment is used to describe WikiPathways.";
-  dct:hasVersion "1.0" ;
+  dct:hasVersion "%%DATE%%" ;
   dct:license <http://rdflicense.appspot.com/rdflicense/cc-by-nc-nd4.0>;
   dct:publisher <https://wikipathways.org/>;
+  ejprd:vpConnection <https://w3id.org/ejp-rd/vocabulary#VPDiscoverable>;
+  ejprd:personalData "false";
   dct:conformsTo [ rdfs:label "FAIR Data Point Profile" ];
   dct:accessRights <https://fdp.wikipathways.org/#accessRights> ;
   dct:language <http://id.loc.gov/vocabulary/iso639-1/en>;
@@ -14,7 +18,10 @@
   fdpo:metadataCatalog
     <https://fdp.wikipathways.org/catalog/index.ttl> .
 
-<https://wikipathways.org/> a foaf:Agent ; foaf:name "WikiPathways" .
+<https://wikipathways.org/> a foaf:Agent ;
+  foaf:page <https://www.wikipathways.org/> ;
+  dct:title "WikiPathways" ;
+  foaf:name "WikiPathways" .
 
 <https://fdp.wikipathways.org/#accessRights> a dct:RightsStatement;
   dct:description "This resource has no access restriction" .
diff --git a/index.html b/index.html
index 226a777..5f5dea4 100644
--- a/index.html
+++ b/index.html
@@ -5,15 +5,20 @@
 @prefix ldp:   <http://www.w3.org/ns/ldp#> .
 @prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix foaf:  <http://xmlns.com/foaf/0.1/> .
+@prefix ejprd: <https://w3id.org/ejp-rd/vocabulary#> .
 
 <https://fdp.wikipathways.org/index.ttl> a dcat:Resource, dcat:DataService, fdpo:MetadataService, fdpo:FairDataPoint ;
   rdfs:label "WikiPathways FAIR Data Point";
   dct:title "WikiPathways FAIR Data Point";
+  foaf:logo <https://upload.wikimedia.org/wikipedia/commons/8/83/Wplogo_with_text_500.png>;
+  dct:theme <http://vocabularies.wikipathways.org/wp#Pathway>;
   dct:conformsTo <https://www.purl.org/fairtools/fdp/schema/0.1/fdpMetadata>;
   dct:description "This FAIR Data Point deployment is used to describe WikiPathways.";
-  dct:hasVersion "1.0" ;
+  dct:hasVersion "20240710" ;
   dct:license <http://rdflicense.appspot.com/rdflicense/cc-by-nc-nd4.0>;
   dct:publisher <https://wikipathways.org/>;
+  ejprd:vpConnection <https://w3id.org/ejp-rd/vocabulary#VPDiscoverable>;
+  ejprd:personalData "false";
   dct:conformsTo [ rdfs:label "FAIR Data Point Profile" ];
   dct:accessRights <https://fdp.wikipathways.org/#accessRights> ;
   dct:language <http://id.loc.gov/vocabulary/iso639-1/en>;
@@ -22,7 +27,10 @@
   fdpo:metadataCatalog
     <https://fdp.wikipathways.org/catalog/index.ttl> .
 
-<https://wikipathways.org/> a foaf:Agent ; foaf:name "WikiPathways" .
+<https://wikipathways.org/> a foaf:Agent ;
+  foaf:page <https://www.wikipathways.org/> ;
+  dct:title "WikiPathways" ;
+  foaf:name "WikiPathways" .
 
 <https://fdp.wikipathways.org/#accessRights> a dct:RightsStatement;
   dct:description "This resource has no access restriction" .
diff --git a/index.template b/index.template
deleted file mode 100644
index 3fba80c..0000000
--- a/index.template
+++ /dev/null
@@ -1,26 +0,0 @@
-<https://fdp.wikipathways.org/index.ttl> a dcat:Resource, dcat:DataService, fdpo:MetadataService, fdpo:FairDataPoint ;
-  rdfs:label "WikiPathways FAIR Data Point";
-  dct:title "WikiPathways FAIR Data Point";
-  dct:conformsTo <https://www.purl.org/fairtools/fdp/schema/0.1/fdpMetadata>;
-  dct:description "This FAIR Data Point deployment is used to describe WikiPathways.";
-  dct:hasVersion "1.0" ;
-  dct:license <http://rdflicense.appspot.com/rdflicense/cc-by-nc-nd4.0>;
-  dct:publisher <https://wikipathways.org/>;
-  dct:conformsTo [ rdfs:label "FAIR Data Point Profile" ];
-  dct:accessRights <https://fdp.wikipathways.org/#accessRights> ;
-  dct:language <http://id.loc.gov/vocabulary/iso639-1/en>;
-  fdpo:metadataIssued "2023-03-10T07:42:08.000Z"^^xsd:dateTime;
-  fdpo:metadataModified "2024-02-10T13:06:00.000Z"^^xsd:dateTime;
-  fdpo:metadataCatalog
-    <https://fdp.wikipathways.org/catalog/index.ttl> .
-
-<https://wikipathways.org/> a foaf:Agent ; foaf:name "WikiPathways" .
-
-<https://fdp.wikipathways.org/#accessRights> a dct:RightsStatement;
-  dct:description "This resource has no access restriction" .
-  
-<http://fdp.wikipathways.org/catalogs/index.ttl> a ldp:DirectContainer;
-  dct:title "WikiPathways Catalogs";
-  ldp:hasMemberRelation <https://w3id.org/fdp/fdpo#metadataCatalog> ;
-  ldp:membershipResource <https://fdp.wikipathways.org/> ;
-  ldp:contains <https://fdp.wikipathways.org/catalog/index.ttl> .
diff --git a/index.ttl b/index.ttl
index 226a777..5f5dea4 100644
--- a/index.ttl
+++ b/index.ttl
@@ -5,15 +5,20 @@
 @prefix ldp:   <http://www.w3.org/ns/ldp#> .
 @prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix foaf:  <http://xmlns.com/foaf/0.1/> .
+@prefix ejprd: <https://w3id.org/ejp-rd/vocabulary#> .
 
 <https://fdp.wikipathways.org/index.ttl> a dcat:Resource, dcat:DataService, fdpo:MetadataService, fdpo:FairDataPoint ;
   rdfs:label "WikiPathways FAIR Data Point";
   dct:title "WikiPathways FAIR Data Point";
+  foaf:logo <https://upload.wikimedia.org/wikipedia/commons/8/83/Wplogo_with_text_500.png>;
+  dct:theme <http://vocabularies.wikipathways.org/wp#Pathway>;
   dct:conformsTo <https://www.purl.org/fairtools/fdp/schema/0.1/fdpMetadata>;
   dct:description "This FAIR Data Point deployment is used to describe WikiPathways.";
-  dct:hasVersion "1.0" ;
+  dct:hasVersion "20240710" ;
   dct:license <http://rdflicense.appspot.com/rdflicense/cc-by-nc-nd4.0>;
   dct:publisher <https://wikipathways.org/>;
+  ejprd:vpConnection <https://w3id.org/ejp-rd/vocabulary#VPDiscoverable>;
+  ejprd:personalData "false";
   dct:conformsTo [ rdfs:label "FAIR Data Point Profile" ];
   dct:accessRights <https://fdp.wikipathways.org/#accessRights> ;
   dct:language <http://id.loc.gov/vocabulary/iso639-1/en>;
@@ -22,7 +27,10 @@
   fdpo:metadataCatalog
     <https://fdp.wikipathways.org/catalog/index.ttl> .
 
-<https://wikipathways.org/> a foaf:Agent ; foaf:name "WikiPathways" .
+<https://wikipathways.org/> a foaf:Agent ;
+  foaf:page <https://www.wikipathways.org/> ;
+  dct:title "WikiPathways" ;
+  foaf:name "WikiPathways" .
 
 <https://fdp.wikipathways.org/#accessRights> a dct:RightsStatement;
   dct:description "This resource has no access restriction" .
diff --git a/prefixes.template b/prefixes.template
index 2f677cf..1f11096 100644
--- a/prefixes.template
+++ b/prefixes.template
@@ -5,3 +5,4 @@
 @prefix ldp:   <http://www.w3.org/ns/ldp#> .
 @prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix foaf:  <http://xmlns.com/foaf/0.1/> .
+@prefix ejprd: <https://w3id.org/ejp-rd/vocabulary#> .