-
Notifications
You must be signed in to change notification settings - Fork 18
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 (ontologies): Use Knora-specific properties instead of rdfs properties to check consistency during updates #49
Conversation
…ra-specific properties. - Remove unused definitions. - Correct and shorten comments. - Fix various inconsistencies. - Add copyright notices. (All this is untested.)
- Change test data to match ontology changes. - Remove failing, unsupported embedded triplestore tests from TriplestoreManagerActorSpec.
Conflicts: webapi/src/test/scala/org/knora/webapi/store/triplestore/TriplestoreManagerActorSpec.scala
Conflicts: webapi/src/main/scala/org/knora/webapi/responders/v1/ResourcesResponderV1.scala webapi/src/main/scala/org/knora/webapi/responders/v1/ValueUtilV1.scala webapi/src/main/scala/org/knora/webapi/responders/v1/ValuesResponderV1.scala
In |
Could you update the knora-base documentation ( |
- Fix resourceIcon in knora-base.ttl.
Yes. Fixed.
Done. |
I missed a few |
Did you replace I am concerned that - given the multitude of changes made to the ontology files - we cannot really assure that we actually did not change the ontology by accident. |
Yes.
If I made a mistake, it's your job as reviewer to find it. :) But all the tests still pass. |
Other things I changed, besides
|
And I took out the statements that imported ontologies into other ontologies. These seemed to be there only because of some limitation of Protégé, and that didn't seem like a good enough reason to keep them. |
We should be sure that when we make a lot changes that they were actually done in a consistent way. What about counting all the original occurrences of Since it is a search and replace operation, the numbers should be the same. In the actual branch: grep "subjectClassConstraint" knora-base.ttl | wc -l On development branch: grep "rdfs:domain" knora-base.ttl | wc -l As a reviewer, it is my job to mistakes and inconsistencies. But I cannot go through every line you changed. |
It wasn't just a search and replace operation. I had to look at every case manually, and I corrected a lot of things that were either incorrect or impractical, so just counting the changes won't work. For example, I removed
I removed these because I think they probably won't work with constraint checking. Once constraint checking works, I can try to put them back. I've just gone through all the changes in These properties had
These properties had
The property The property These properties had an
The property Other changes: I changed I changed some cardinalities that were clearly wrong (e.g. in I removed I removed the
What do you think I do when I review your changes? :) |
Ok, let me have a final look at it :-) |
In |
Otherwise, the changes seem fine to me. In the Scala code, you simply had to replace one constant by another and adapt method, parameter and variable names. |
Thanks, fixed now. |
fix (ontologies): Use Knora-specific properties instead of rdfs properties to check consistency during updates
This pull request replaces
rdfs:domain
andrdfs:range
, which we were misusing for consistency checking, with Knora-specific properties, following the discussion in #34 and #33.rdfs:domain
is replaced withknora-base:subjectClassConstraint
.rdfs:range
is replaced withknora-base:objectClassConstraint
andknora-base:objectDatatypeConstraint
.A subsequent pull request will enable us to use GraphDB's built-in consistency checking for both
knora-base:subjectClassConstraint
andknora-base:objectClassConstraint
.I've also cleaned up the ontologies a bit in general.
The old SALSAH export script will also need to be changed to output these Knora-specific properties instead of
rdfs:domain
andrdfs:range
.