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.

Sign up for GitHub

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

Jump to bottom

fix(api-v2): Fix custom datatypes in knora-api simple ontology #1601

Merged
merged 2 commits into from Feb 21, 2020
Merged

fix(api-v2): Fix custom datatypes in knora-api simple ontology #1601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a56112
fix(api-v2): Fix custom datatypes in knora-api simple ontology.
Feb 19, 2020
423e4e0
fix(api-v2): Fix parsing of custom datatype definitions.
Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion ...i/messages/v2/responder/ontologymessages/KnoraBaseToApiV2ComplexTransformationRules.scala
View file
Open in desktop
Expand Up @@ -32,12 +32,17 @@ import org.knora.webapi.util.{SmartIri, StringFormatter}
object KnoraBaseToApiV2ComplexTransformationRules extends OntologyTransformationRules {
private implicit val stringFormatter: StringFormatter = StringFormatter.getInstanceForConstantOntologies

override val ontologyMetadata = OntologyMetadataV2(
override val ontologyMetadata: OntologyMetadataV2 = OntologyMetadataV2(
ontologyIri = OntologyConstants.KnoraApiV2Complex.KnoraApiOntologyIri.toSmartIri,
projectIri = Some(OntologyConstants.KnoraAdmin.SystemProject.toSmartIri),
label = Some("The knora-api ontology in the complex schema")
)

private val Label: ReadPropertyInfoV2 = makeProperty(
propertyIri = OntologyConstants.Rdfs.Label,
propertyType = OntologyConstants.Owl.DatatypeProperty
)

private val Result: ReadPropertyInfoV2 = makeProperty(
propertyIri = OntologyConstants.KnoraApiV2Complex.Result,
propertyType = OntologyConstants.Owl.DatatypeProperty,
Expand Down Expand Up @@ -1757,6 +1762,7 @@ object KnoraBaseToApiV2ComplexTransformationRules extends OntologyTransformation
* See also [[OntologyConstants.CorrespondingIris]].
*/
override val externalPropertiesToAdd: Map[SmartIri, ReadPropertyInfoV2] = Set(
Label,
Result,
Error,
UserHasPermission,
Expand Down
55 changes: 36 additions & 19 deletions ...pi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2SimpleTransformationRules.scala
View file
Open in desktop
Expand Up @@ -33,12 +33,17 @@ object KnoraBaseToApiV2SimpleTransformationRules extends OntologyTransformationR

private implicit val stringFormatter: StringFormatter = StringFormatter.getInstanceForConstantOntologies

override val ontologyMetadata = OntologyMetadataV2(
override val ontologyMetadata: OntologyMetadataV2 = OntologyMetadataV2(
ontologyIri = OntologyConstants.KnoraApiV2Simple.KnoraApiOntologyIri.toSmartIri,
projectIri = Some(OntologyConstants.KnoraAdmin.SystemProject.toSmartIri),
label = Some("The knora-api ontology in the simple schema")
)

private val Label: ReadPropertyInfoV2 = makeProperty(
propertyIri = OntologyConstants.Rdfs.Label,
propertyType = OntologyConstants.Owl.DatatypeProperty
)

private val Result: ReadPropertyInfoV2 = makeProperty(
propertyIri = OntologyConstants.KnoraApiV2Simple.Result,
propertyType = OntologyConstants.Owl.DatatypeProperty,
Expand Down Expand Up @@ -207,7 +212,10 @@ object KnoraBaseToApiV2SimpleTransformationRules extends OntologyTransformationR

private val Date: ReadClassInfoV2 = makeDatatype(
datatypeIri = OntologyConstants.KnoraApiV2Simple.Date,
xsdStringRestrictionPattern = Some("(GREGORIAN|JULIAN):\\d{1,4}(-\\d{1,2}(-\\d{1,2})?)?( BC| AD| BCE| CE)?(:\\d{1,4}(-\\d{1,2}(-\\d{1,2})?)?( BC| AD| BCE| CE)?)?"),
datatypeInfo = DatatypeInfoV2(
onDatatype = OntologyConstants.Xsd.String.toSmartIri,
pattern = Some("(GREGORIAN|JULIAN):\\d{1,4}(-\\d{1,2}(-\\d{1,2})?)?( BC| AD| BCE| CE)?(:\\d{1,4}(-\\d{1,2}(-\\d{1,2})?)?( BC| AD| BCE| CE)?)?")
),
predicates = Seq(
makePredicate(
predicateIri = OntologyConstants.Rdfs.Label,
Expand All @@ -226,7 +234,10 @@ object KnoraBaseToApiV2SimpleTransformationRules extends OntologyTransformationR

private val Color: ReadClassInfoV2 = makeDatatype(
datatypeIri = OntologyConstants.KnoraApiV2Simple.Color,
xsdStringRestrictionPattern = Some("#([0-9a-fA-F]{3}){1,2}"),
datatypeInfo = DatatypeInfoV2(
onDatatype = OntologyConstants.Xsd.String.toSmartIri,
pattern = Some("#([0-9a-fA-F]{3}){1,2}")
),
predicates = Seq(
makePredicate(
predicateIri = OntologyConstants.Rdfs.Label,
Expand All @@ -245,7 +256,10 @@ object KnoraBaseToApiV2SimpleTransformationRules extends OntologyTransformationR

private val Interval: ReadClassInfoV2 = makeDatatype(
datatypeIri = OntologyConstants.KnoraApiV2Simple.Interval,
xsdStringRestrictionPattern = Some("\\d+(\\.\\d+)?,\\d+(\\.\\d+)?"),
datatypeInfo = DatatypeInfoV2(
onDatatype = OntologyConstants.Xsd.String.toSmartIri,
pattern = Some("\\d+(\\.\\d+)?,\\d+(\\.\\d+)?")
),
predicates = Seq(
makePredicate(
predicateIri = OntologyConstants.Rdfs.Label,
Expand All @@ -264,7 +278,10 @@ object KnoraBaseToApiV2SimpleTransformationRules extends OntologyTransformationR

private val Geoname: ReadClassInfoV2 = makeDatatype(
datatypeIri = OntologyConstants.KnoraApiV2Simple.Geoname,
xsdStringRestrictionPattern = Some("\\d{1,8}"),
datatypeInfo = DatatypeInfoV2(
onDatatype = OntologyConstants.Xsd.String.toSmartIri,
pattern = Some("\\d{1,8}")
),
predicates = Seq(
makePredicate(
predicateIri = OntologyConstants.Rdfs.Label,
Expand All @@ -283,7 +300,9 @@ object KnoraBaseToApiV2SimpleTransformationRules extends OntologyTransformationR

private val Geom: ReadClassInfoV2 = makeDatatype(
datatypeIri = OntologyConstants.KnoraApiV2Simple.Geom,
subClassOf = Some(OntologyConstants.Xsd.String),
datatypeInfo = DatatypeInfoV2(
onDatatype = OntologyConstants.Xsd.String.toSmartIri
),
predicates = Seq(
makePredicate(
predicateIri = OntologyConstants.Rdfs.Label,
Expand All @@ -302,7 +321,9 @@ object KnoraBaseToApiV2SimpleTransformationRules extends OntologyTransformationR

private val File: ReadClassInfoV2 = makeDatatype(
datatypeIri = OntologyConstants.KnoraApiV2Simple.File,
subClassOf = Some(OntologyConstants.Xsd.Uri),
datatypeInfo = DatatypeInfoV2(
onDatatype = OntologyConstants.Xsd.Uri.toSmartIri
),
predicates = Seq(
makePredicate(
predicateIri = OntologyConstants.Rdfs.Label,
Expand All @@ -321,7 +342,9 @@ object KnoraBaseToApiV2SimpleTransformationRules extends OntologyTransformationR

private val ListNode: ReadClassInfoV2 = makeDatatype(
datatypeIri = OntologyConstants.KnoraApiV2Simple.ListNode,
xsdStringRestrictionPattern = Some(".+"),
datatypeInfo = DatatypeInfoV2(
onDatatype = OntologyConstants.Xsd.String.toSmartIri
),
predicates = Seq(
makePredicate(
predicateIri = OntologyConstants.Rdfs.Label,
Expand Down Expand Up @@ -534,6 +557,7 @@ object KnoraBaseToApiV2SimpleTransformationRules extends OntologyTransformationR
* See also [[OntologyConstants.CorrespondingIris]].
*/
override val externalPropertiesToAdd: Map[SmartIri, ReadPropertyInfoV2] = Set(
Label,
Result,
Error,
ArkUrl,
Expand Down Expand Up @@ -625,16 +649,12 @@ object KnoraBaseToApiV2SimpleTransformationRules extends OntologyTransformationR
* Makes a [[ReadClassInfoV2]] representing an rdfs:Datatype.
*
* @param datatypeIri the IRI of the datatype.
* @param subClassOf the superclass of the datatype.
* @param xsdStringRestrictionPattern an optional xsd:pattern specifying
* the regular expression that restricts its values. This has the effect of making the
* class a subclass of a blank node with owl:onDatatype xsd:string.
* @param datatypeInfo a [[DatatypeInfoV2]] describing the datatype.
* @param predicates the predicates of the datatype.
* @return a [[ReadClassInfoV2]].
*/
private def makeDatatype(datatypeIri: IRI,
subClassOf: Option[IRI] = None,
xsdStringRestrictionPattern: Option[String] = None,
datatypeInfo: DatatypeInfoV2,
predicates: Seq[PredicateInfoV2] = Seq.empty[PredicateInfoV2]): ReadClassInfoV2 = {

val rdfType = OntologyConstants.Rdf.Type.toSmartIri -> PredicateInfoV2(
Expand All @@ -645,16 +665,13 @@ object KnoraBaseToApiV2SimpleTransformationRules extends OntologyTransformationR
ReadClassInfoV2(
entityInfoContent = ClassInfoContentV2(
classIri = datatypeIri.toSmartIri,
xsdStringRestrictionPattern = xsdStringRestrictionPattern,
datatypeInfo = Some(datatypeInfo),
predicates = predicates.map {
pred => pred.predicateIri -> pred
}.toMap + rdfType,
subClassOf = subClassOf.toSet.map {
iri: IRI => iri.toSmartIri
},
ontologySchema = ApiV2Simple
),
allBaseClasses = subClassOf.map(_.toSmartIri).toSet + datatypeIri.toSmartIri
allBaseClasses = Set(datatypeIri.toSmartIri)
)
}
}