X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/2ad41cd1a945a4ce97824464de40646bb899259e..8741d155d948c7317945eee423a977940cad995e:/src/cxtm/canonicalizer.lisp diff --git a/src/cxtm/canonicalizer.lisp b/src/cxtm/canonicalizer.lisp index 8d726d8..65496a6 100644 --- a/src/cxtm/canonicalizer.lisp +++ b/src/cxtm/canonicalizer.lisp @@ -131,8 +131,12 @@ (fail :invalid-date-value "Occurrence value is not a valid XSD 1.0 date.")) (unless (canonical-date-lexical-form (occurrence-value item)) (fail :date-timezone-canonicalization "XSD date recoverable-timezone canonicalization is outside this slice." t))) - (when (string= (occurrence-datatype item) "http://www.w3.org/2001/XMLSchema#dateTime") - (fail :unsupported-occurrence-datatype "DateTime canonicalization is not implemented." t)) + (when (string= (occurrence-datatype item) (datetime-datatype)) + (unless (datetime-lexical-p (occurrence-value item)) + (fail :invalid-datetime-value "Occurrence value is not a valid XSD 1.0 dateTime.")) + (multiple-value-bind (value reason) (canonical-datetime-lexical-form (occurrence-value item)) + (unless value (fail (if (eq reason :unsupported-timezone) :datetime-timezone-canonicalization :datetime-leap-second-context) + "DateTime timezone/leap context is outside this canonical subset." t)))) (when (and (string= (occurrence-datatype item) (iri-datatype)) (not (topic-maps.tmdm::absolute-locator-p (occurrence-value item)))) (fail :invalid-occurrence-value "IRI-valued Occurrences must store an absolute locator.")) @@ -223,6 +227,8 @@ Variants or non-Topic identifiers other than Occurrence identifiers. Does not mu (canonical-decimal-lexical-form (occurrence-value item))) ((string= (occurrence-datatype item) (date-datatype)) (canonical-date-lexical-form (occurrence-value item))) + ((string= (occurrence-datatype item) (datetime-datatype)) + (canonical-datetime-lexical-form (occurrence-value item))) (t (occurrence-value item))) out) (format out "~%") ;; CXTM 3.14: datatype locator is NOT base-normalized.