X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/437ad53ea7539d36db3fa871d0931650b7a6a03e..2ad41cd1a945a4ce97824464de40646bb899259e:/src/tmdm/occurrences.lisp diff --git a/src/tmdm/occurrences.lisp b/src/tmdm/occurrences.lisp index 7338d01..7b05c68 100644 --- a/src/tmdm/occurrences.lisp +++ b/src/tmdm/occurrences.lisp @@ -54,11 +54,20 @@ map) (defun add-occurrence (topic type value &key (datatype (string-datatype)) item-identifiers) "Create an unscoped Occurrence; TYPE must be a same-map Topic. VALUE and DATATYPE -are strings; anyURI VALUE must already be absolute (TMDM 4.3), never resolved here. +are strings; DATATYPE is any absolute locator (TMDM 4.4). Supported Integer/Decimal/Date +lexical forms are validated; stored strings are never rewritten. +anyURI VALUE must already be absolute, never resolved here. Validate before mutation, return current representative after duplicate replacement." (check-type value string) (check-type datatype string) - (unless (member datatype (list (string-datatype) (iri-datatype)) :test #'string=) - (occurrence-problem :unsupported-datatype "Only xsd:string and xsd:anyURI are supported.")) + ;; TMDM 4.4/5.6: datatype is a locator, never a Topic or a whitelist. + (unless (absolute-locator-p datatype) + (occurrence-problem :invalid-datatype "Datatype must be a resolved absolute locator.")) + (when (and (string= datatype (integer-datatype)) (not (integer-lexical-p value))) + (occurrence-problem :invalid-integer-value "Value is not an xsd:integer lexical form.")) + (when (and (string= datatype (decimal-datatype)) (not (decimal-lexical-p value))) + (occurrence-problem :invalid-decimal-value "Value is not an xsd:decimal lexical form.")) + (when (and (string= datatype (date-datatype)) (not (date-lexical-p value))) + (occurrence-problem :invalid-date-value "Value is not an XSD 1.0 date lexical form or valid Gregorian date.")) (when (and (string= datatype (iri-datatype)) (not (absolute-locator-p value))) (occurrence-problem :relative-uri-value "TMDM IRI-valued Occurrences require an absolute locator.")) (let* ((topic (live-topic topic)) (type (live-topic type)) (map (%topic-parent topic)))