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

fix: Temporarily bring back support for isSequenceOf while it exists in data #3162

Merged
merged 3 commits into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
Expand Up @@ -1285,6 +1285,18 @@
},
"@id": "knora-api:hasSegmentBounds"
},
{
"rdfs:label": "Sequence Bounds",
"rdfs:subPropertyOf": {
"@id": "knora-api:hasValue"
},
"rdfs:comment": "Indicates the bounds of a sequence, i.e. the start and end point in the containing resource.",
"@type": "owl:DatatypeProperty",
"knora-api:objectType": {
"@id": "knora-api:Interval"
},
"@id": "knora-api:hasSequenceBounds"
},
{
"rdfs:label": "has Standoff Link to",
"rdfs:subPropertyOf": {
Expand Down Expand Up @@ -1432,6 +1444,21 @@
},
"@id": "knora-api:isSegmentOf"
},
{
"rdfs:label": "is sequence of",
"rdfs:subPropertyOf": {
"@id": "knora-api:hasLinkTo"
},
"rdfs:comment": "Deprecated in favour of :Segment",
"@type": "owl:ObjectProperty",
"knora-api:subjectType": {
"@id": "knora-api:Resource"
},
"knora-api:objectType": {
"@id": "knora-api:Resource"
},
"@id": "knora-api:isSequenceOf"
},
{
"rdfs:label": "is video segment of",
"rdfs:subPropertyOf": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8184,6 +8184,20 @@
},
"rdfs:comment": "Indicates the bounds of a segment, i.e. the start and end point in the containing resource."
},
{
"rdfs:label": "Sequence Bounds",
"rdfs:subPropertyOf": {
"@id": "knora-api:hasValue"
},
"knora-api:isEditable": true,
"knora-api:isResourceProperty": true,
"rdfs:comment": "Indicates the bounds of a sequence, i.e. the start and end point in the containing resource.",
"@type": "owl:ObjectProperty",
"knora-api:objectType": {
"@id": "knora-api:IntervalValue"
},
"@id": "knora-api:hasSequenceBounds"
},
{
"rdfs:label": "has Standoff Link to",
"rdfs:subPropertyOf": {
Expand Down Expand Up @@ -8581,6 +8595,41 @@
},
"@id": "knora-api:isSegmentOfValue"
},
{
"rdfs:label": "is sequence of",
"rdfs:subPropertyOf": {
"@id": "knora-api:hasLinkTo"
},
"knora-api:isEditable": true,
"knora-api:isResourceProperty": true,
"@type": "owl:ObjectProperty",
"knora-api:objectType": {
"@id": "knora-api:Resource"
},
"@id": "knora-api:isSequenceOf",
"knora-api:subjectType": {
"@id": "knora-api:Resource"
},
"knora-api:isLinkProperty": true,
"rdfs:comment": "Deprecated in favour of :Segment"
},
{
"knora-api:isLinkValueProperty": true,
"rdfs:subPropertyOf": {
"@id": "knora-api:hasLinkToValue"
},
"knora-api:isEditable": true,
"knora-api:isResourceProperty": true,
"@type": "owl:ObjectProperty",
"knora-api:objectType": {
"@id": "knora-api:LinkValue"
},
"@id": "knora-api:isSequenceOfValue",
"knora-api:subjectType": {
"@id": "knora-api:Resource"
},
"rdfs:comment": "Deprecated in favour of :Segment"
},
{
"rdfs:label": "is shared",
"rdfs:comment": "Indicates whether an ontology can be shared by multiple projects",
Expand Down
39 changes: 38 additions & 1 deletion webapi/src/main/resources/knora-ontologies/knora-base.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
rdf:type owl:Ontology ;
rdfs:label "The Knora base ontology"@en ;
:attachedToProject knora-admin:SystemProject ;
:ontologyVersion "knora-base v33" .
:ontologyVersion "knora-base v34" .


#################################################################
Expand Down Expand Up @@ -2366,3 +2366,40 @@
"Video Segment"@en ;
:canBeInstantiated true ;
rdfs:comment "A segment of a video resource"@en .

### http://www.knora.org/ontology/knora-base#isSequenceOf

:isSequenceOf
rdf:type owl:ObjectProperty ;
rdfs:label "ist Sequenz von"@de,
"is sequence of"@en,
"fait partie de"@fr,
"fa parte di"@it ;
rdfs:comment "Deprecated in favour of :Segment"@en ;
:subjectClassConstraint :Resource ;
:objectClassConstraint :Resource ;
:isEditable true ;
rdfs:subPropertyOf :hasLinkTo .


### http://www.knora.org/ontology/knora-base#isSequenceOfValue

:isSequenceOfValue
rdf:type owl:ObjectProperty ;
:objectClassConstraint :LinkValue ;
:subjectClassConstraint :Resource ;
:isEditable true ;
rdfs:comment "Deprecated in favour of :Segment"@en ;
rdfs:subPropertyOf :hasLinkToValue .

### http://www.knora.org/ontology/knora-base#hasSequenceBounds

:hasSequenceBounds
rdf:type owl:ObjectProperty ;
:objectClassConstraint :IntervalValue ;
:isEditable true ;
rdfs:subPropertyOf :hasValue ;
rdfs:label "Sequenz-Grenzen"@de,
"Sequence Bounds"@en ;
rdfs:comment "Deprecated in favour of :Segment"@en ;
rdfs:comment "Indicates the bounds of a sequence, i.e. the start and end point in the containing resource."@en .
2 changes: 1 addition & 1 deletion webapi/src/main/scala/org/knora/webapi/package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* The version of `knora-base` and of the other built-in ontologies that this version of Knora requires.
* Must be the same as the object of `knora-base:ontologyVersion` in the `knora-base` ontology being used.
*/
val KnoraBaseVersion: String = "knora-base v33"
val KnoraBaseVersion: String = "knora-base v34"

Check warning on line 14 in webapi/src/main/scala/org/knora/webapi/package.scala

View check run for this annotation

Codecov / codecov/patch

webapi/src/main/scala/org/knora/webapi/package.scala#L14

Added line #L14 was not covered by tests

/**
* `IRI` is a synonym for `String`, used to improve code readability.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
PluginForKnoraBaseVersion(versionNumber = 31, plugin = new UpgradePluginPR3112()),
PluginForKnoraBaseVersion(versionNumber = 32, plugin = new MigrateOnlyBuiltInGraphs()),
PluginForKnoraBaseVersion(versionNumber = 33, plugin = new MigrateOnlyBuiltInGraphs()),
PluginForKnoraBaseVersion(versionNumber = 34, plugin = new MigrateOnlyBuiltInGraphs()),

Check warning on line 52 in webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdatePlan.scala

View check run for this annotation

Codecov / codecov/patch

webapi/src/main/scala/org/knora/webapi/store/triplestore/upgrade/RepositoryUpdatePlan.scala#L52

Added line #L52 was not covered by tests
)

/**
Expand Down
Loading