From 4eb157458f13d123136e06b07e83babd3d2c1465 Mon Sep 17 00:00:00 2001 From: b0bkaT Date: Wed, 11 Jan 2023 15:34:01 -0500 Subject: [PATCH 1/4] Added missing prefixes to sparql queries --- ontology/owl/owl.ttl | 3 ++- ontology/uco/core/core.ttl | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ontology/owl/owl.ttl b/ontology/owl/owl.ttl index d5bd3f39..9e5dfd13 100644 --- a/ontology/owl/owl.ttl +++ b/ontology/owl/owl.ttl @@ -226,7 +226,8 @@ uco-owl:ObjectProperty-shacl-constraints-shape a sh:SPARQLConstraint ; sh:message "An OWL Object Property must not permit a Literal value via SHACL consraints."@en ; sh:select """ - PREFIX sh: + PREFIX rdf: + PREFIX sh: SELECT $this ?value WHERE { ?value diff --git a/ontology/uco/core/core.ttl b/ontology/uco/core/core.ttl index 55a4b752..a9f36fcc 100644 --- a/ontology/uco/core/core.ttl +++ b/ontology/uco/core/core.ttl @@ -414,7 +414,8 @@ core:UcoThing a sh:SPARQLConstraint ; sh:message "UcoThings are required to not be blank nodes."@en ; sh:select """ - PREFIX uco-core: + PREFIX rdfs: + PREFIX uco-core: SELECT $this WHERE { $this a/rdfs:subClassOf* uco-core:UcoThing . @@ -435,7 +436,8 @@ core:UcoThing-identifier-regex-shape rdfs:seeAlso ; sh:message "UcoThings are suggested to end with a UUID."@en ; sh:select ''' - PREFIX uco-core: + PREFIX rdfs: + PREFIX uco-core: SELECT $this WHERE { $this a/rdfs:subClassOf* uco-core:UcoThing . From ecc252ea79353752f54c71c4e942ae4c50c2de70 Mon Sep 17 00:00:00 2001 From: b0bkaT Date: Wed, 11 Jan 2023 16:01:06 -0500 Subject: [PATCH 2/4] Aligned 'core' prefixes --- ontology/uco/core/core.ttl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ontology/uco/core/core.ttl b/ontology/uco/core/core.ttl index a9f36fcc..32977cd7 100644 --- a/ontology/uco/core/core.ttl +++ b/ontology/uco/core/core.ttl @@ -415,10 +415,10 @@ core:UcoThing sh:message "UcoThings are required to not be blank nodes."@en ; sh:select """ PREFIX rdfs: - PREFIX uco-core: + PREFIX core: SELECT $this WHERE { - $this a/rdfs:subClassOf* uco-core:UcoThing . + $this a/rdfs:subClassOf* core:UcoThing . FILTER isBlank ($this) } """ ; @@ -437,10 +437,10 @@ core:UcoThing-identifier-regex-shape sh:message "UcoThings are suggested to end with a UUID."@en ; sh:select ''' PREFIX rdfs: - PREFIX uco-core: + PREFIX core: SELECT $this WHERE { - $this a/rdfs:subClassOf* uco-core:UcoThing . + $this a/rdfs:subClassOf* core:UcoThing . FILTER ( ! REGEX ( STR($this), From f2b5947d5c0da8c8f0c0b359639e2cb56b626cd6 Mon Sep 17 00:00:00 2001 From: b0bkaT Date: Tue, 17 Jan 2023 12:22:41 -0500 Subject: [PATCH 3/4] Fixed formatting issues --- ontology/owl/owl.ttl | 2 +- ontology/uco/core/core.ttl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ontology/owl/owl.ttl b/ontology/owl/owl.ttl index 9e5dfd13..cfa141ae 100644 --- a/ontology/owl/owl.ttl +++ b/ontology/owl/owl.ttl @@ -227,7 +227,7 @@ uco-owl:ObjectProperty-shacl-constraints-shape sh:message "An OWL Object Property must not permit a Literal value via SHACL consraints."@en ; sh:select """ PREFIX rdf: - PREFIX sh: + PREFIX sh: SELECT $this ?value WHERE { ?value diff --git a/ontology/uco/core/core.ttl b/ontology/uco/core/core.ttl index 32977cd7..5b05ba6a 100644 --- a/ontology/uco/core/core.ttl +++ b/ontology/uco/core/core.ttl @@ -415,7 +415,7 @@ core:UcoThing sh:message "UcoThings are required to not be blank nodes."@en ; sh:select """ PREFIX rdfs: - PREFIX core: + PREFIX core: SELECT $this WHERE { $this a/rdfs:subClassOf* core:UcoThing . @@ -437,7 +437,7 @@ core:UcoThing-identifier-regex-shape sh:message "UcoThings are suggested to end with a UUID."@en ; sh:select ''' PREFIX rdfs: - PREFIX core: + PREFIX core: SELECT $this WHERE { $this a/rdfs:subClassOf* core:UcoThing . From 494c4ad8a45599194c8e152e1616206bc631e4e1 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 17 Jan 2023 21:58:18 -0500 Subject: [PATCH 4/4] Regenerate Make-managed files References: * https://github.com/ucoProject/UCO/issues/513 Signed-off-by: Alex Nelson --- tests/examples/uco_thing_XFAIL_validation.ttl | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/examples/uco_thing_XFAIL_validation.ttl b/tests/examples/uco_thing_XFAIL_validation.ttl index d126561a..ab5f6013 100644 --- a/tests/examples/uco_thing_XFAIL_validation.ttl +++ b/tests/examples/uco_thing_XFAIL_validation.ttl @@ -19,10 +19,11 @@ rdfs:seeAlso ; sh:message "UcoThings are suggested to end with a UUID."@en ; sh:select ''' - PREFIX uco-core: + PREFIX rdfs: + PREFIX core: SELECT $this WHERE { - $this a/rdfs:subClassOf* uco-core:UcoThing . + $this a/rdfs:subClassOf* core:UcoThing . FILTER ( ! REGEX ( STR($this), @@ -47,10 +48,11 @@ rdfs:seeAlso ; sh:message "UcoThings are suggested to end with a UUID."@en ; sh:select ''' - PREFIX uco-core: + PREFIX rdfs: + PREFIX core: SELECT $this WHERE { - $this a/rdfs:subClassOf* uco-core:UcoThing . + $this a/rdfs:subClassOf* core:UcoThing . FILTER ( ! REGEX ( STR($this), @@ -77,10 +79,11 @@ a sh:SPARQLConstraint ; sh:message "UcoThings are required to not be blank nodes."@en ; sh:select """ - PREFIX uco-core: + PREFIX rdfs: + PREFIX core: SELECT $this WHERE { - $this a/rdfs:subClassOf* uco-core:UcoThing . + $this a/rdfs:subClassOf* core:UcoThing . FILTER isBlank ($this) } """ ; @@ -105,10 +108,11 @@ rdfs:seeAlso ; sh:message "UcoThings are suggested to end with a UUID."@en ; sh:select ''' - PREFIX uco-core: + PREFIX rdfs: + PREFIX core: SELECT $this WHERE { - $this a/rdfs:subClassOf* uco-core:UcoThing . + $this a/rdfs:subClassOf* core:UcoThing . FILTER ( ! REGEX ( STR($this),