Merge pull request #434 from sanuann/master

refactor schema:url and reproschema:landingPage to type xsd:anyURI
ReproNim · Mar 16, 2021 · 0ca58be · 0ca58be
2 parents a4ffb96 + 44f22ae
commit 0ca58be
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/contexts/generic b/contexts/generic
@@ -38,7 +38,7 @@
             },
             "url": {
                 "@id": "schema:url",
-                "@type": "@id"
+                "@type": "xsd:anyURI"
             },
             "citation": {
                 "@id": "schema:citation",
@@ -71,6 +71,7 @@
             },
             "landingPage": {
                 "@id": "reproschema:landingPage",
+                "@type": "xsd:anyURI",
                 "@container": "@set"
             },
             "question": {

diff --git a/examples/protocols/protocol1.jsonld b/examples/protocols/protocol1.jsonld
@@ -9,6 +9,7 @@
 	"description": "example Protocol",
 	"schemaVersion": "1.0.0-rc1.post",
 	"version": "0.0.1",
+	"landingPage": "http://example.com/sample-readme.md",
 	"messages": [
 		{
 			"message": "Test message: Triggered when item1 value is greater than 0",

diff --git a/validation/reproschema-shacl.ttl b/validation/reproschema-shacl.ttl
@@ -158,7 +158,8 @@ reproschema:ProtocolShape a sh:NodeShape ;
         [ sh:node reproschema:MediaObjectShape ;
             sh:path schema:video ],
 
-        [ sh:nodeKind sh:IRI ;
+        [ sh:datatype xsd:anyURI ;
+            sh:pattern "((http|https)://)(www.)?[a-zA-Z0-9@:%._\\+~#?&//=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%._\\+~#?&//=]*)" ;
             sh:path reproschema:landingPage ],
 
         [ sh:datatype rdf:langString ;
@@ -353,8 +354,9 @@ reproschema:IsVisShape a sh:NodeShape ;
             sh:minCount 1 ;
             sh:path schema:method ],
 
-        [ sh:datatype rdf:langString ;
+        [ sh:datatype xsd:anyURI ;
             sh:minCount 1 ;
+            sh:pattern "((http|https)://)(www.)?[a-zA-Z0-9@:%._\\+~#?&//=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%._\\+~#?&//=]*)" ;
             sh:path schema:url ],
 
         [ sh:datatype rdf:langString ;
@@ -447,7 +449,8 @@ prov:SoftwareAgentShape a sh:NodeShape ;
     sh:property [ sh:datatype rdf:langString ;
             sh:path schema:version ],
 
-        [ sh:nodeKind sh:IRI ;
+        [ sh:datatype xsd:anyURI ;
+            sh:pattern "((http|https)://)(www.)?[a-zA-Z0-9@:%._\\+~#?&//=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%._\\+~#?&//=]*)" ;
             sh:path schema:url ] ;
     sh:targetClass reproschema:SoftwareAgent .