Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fix 513 #514

Merged
merged 4 commits into from
Jan 18, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ontology/owl/owl.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -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: <http://www.w3.org/ns/shacl#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX sh: <http://www.w3.org/ns/shacl#>
ajnelson-nist marked this conversation as resolved.
Show resolved Hide resolved
SELECT $this ?value
WHERE {
?value
Expand Down
10 changes: 6 additions & 4 deletions ontology/uco/core/core.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,11 @@ core:UcoThing
a sh:SPARQLConstraint ;
sh:message "UcoThings are required to not be blank nodes."@en ;
sh:select """
PREFIX uco-core: <https://ontology.unifiedcyberontology.org/uco/core/>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX core: <https://ontology.unifiedcyberontology.org/uco/core/>
SELECT $this
WHERE {
$this a/rdfs:subClassOf* uco-core:UcoThing .
$this a/rdfs:subClassOf* core:UcoThing .
FILTER isBlank ($this)
}
""" ;
Expand All @@ -435,10 +436,11 @@ core:UcoThing-identifier-regex-shape
rdfs:seeAlso <https://datatracker.ietf.org/doc/html/rfc4122#section-4.1.3> ;
sh:message "UcoThings are suggested to end with a UUID."@en ;
sh:select '''
PREFIX uco-core: <https://ontology.unifiedcyberontology.org/uco/core/>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX core: <https://ontology.unifiedcyberontology.org/uco/core/>
SELECT $this
WHERE {
$this a/rdfs:subClassOf* uco-core:UcoThing .
$this a/rdfs:subClassOf* core:UcoThing .
FILTER (
! REGEX (
STR($this),
Expand Down