X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/aeebbc7c6fdbf26642db0b7b5a358a3d04d62cca..7f4aa941293e555ccb9d96f0c05c651b0549a866:/src/xtm/reader.lisp diff --git a/src/xtm/reader.lisp b/src/xtm/reader.lisp index dafd4db..069ced3 100644 --- a/src/xtm/reader.lisp +++ b/src/xtm/reader.lisp @@ -174,6 +174,40 @@ constructs' complete subgrammars is made. XML errors have already been checked." (validate child '("itemIdentity" "scope" "resourceData" "resourceRef")))) (unless scope-seen (reject :missing-variant-scope "variant requires a scope element." node)) (unless resource-seen (reject :missing-variant-resource "variant requires a resource element." node)))) + ((string= name "occurrence") + (attributes node '("reifier") nil) + (when (attr node "reifier") + (resolve-iri (attr node "reifier") *document-iri* node) + (reject :unsupported-construct "XTM occurrence reification is not implemented in this subset." node 'xtm-unsupported)) + (let ((phase 0) (type-seen nil) (scope-seen nil) (resource-seen nil)) + (dolist (child (elements node)) + (check-namespace child) + (let* ((kind (node-name child)) + (next (cond ((string= kind "itemIdentity") 0) + ((string= kind "type") 1) + ((string= kind "scope") 2) + ((member kind '("resourceData" "resourceRef") :test #'string=) 3)))) + (unless next (reject :unexpected-element (format nil "Unexpected ~A element." kind) child)) + (when (< next phase) (reject :element-order "occurrence child order is invalid." child)) + (setf phase next) + (cond + ((string= kind "itemIdentity") + (validate child '("itemIdentity")) + (reject :unsupported-construct "XTM occurrence item identifiers are not implemented in this subset." child 'xtm-unsupported)) + ((string= kind "type") + (when type-seen (reject :duplicate-occurrence-type "Only one occurrence type is allowed." child)) + (setf type-seen t)) + ((string= kind "scope") + (unless type-seen (reject :missing-occurrence-type "occurrence requires type before scope." child)) + (when scope-seen (reject :duplicate-occurrence-scope "Only one occurrence scope is allowed." child)) + (setf scope-seen t)) + (t + (unless type-seen (reject :missing-occurrence-type "occurrence requires type before its resource." child)) + (when resource-seen (reject :occurrence-resource-cardinality "occurrence requires exactly one resource." child)) + (setf resource-seen t))) + (validate child '("type" "scope" "resourceData" "resourceRef")))) + (unless type-seen (reject :missing-occurrence-type "occurrence requires a type element." node)) + (unless resource-seen (reject :missing-occurrence-resource "occurrence requires a resource element." node)))) ((string= name "resourceRef") (leaf-href node)) ((string= name "resourceData") (attributes node '("datatype") nil) @@ -298,6 +332,19 @@ by source validation before model construction. Preserve other datatype IRIs." (dolist (child children) (when (string= (node-name child) "variant") (read-variant child name map))) (topic-maps.tmdm:canonical-topic-name name)))) +(defun read-occurrence (node owner map) + ;; XTM 4.13-4.17/4.20: reuse native Topics and the qualified resource path. + ;; ADD-OCCURRENCE owns live Parent/Type/Scope handles and TMDM 5.6/6.5 merging. + (let* ((children (elements node)) + (type-node (find "type" children :key #'node-name :test #'string=)) + (type (find-reference-topic map (reference-iri (first (elements type-node))))) + (scope-node (find "scope" children :key #'node-name :test #'string=)) + (scope (when scope-node (mapcar (lambda (ref) (find-reference-topic map (reference-iri ref))) + (elements scope-node)))) + (resource (find-if (lambda (child) (member (node-name child) '("resourceData" "resourceRef") :test #'string=)) children))) + (multiple-value-bind (value datatype) (read-resource-value resource) + (topic-maps.tmdm:canonical-occurrence + (topic-maps.tmdm:add-occurrence owner type value :datatype datatype :scope scope))))) (defun read-topic (node map) (let ((topic (topic-maps.tmdm:intern-topic map :item-identifier (concatenate 'string *document-iri* "#" (collapse-space (attr node "id")))))) @@ -306,6 +353,7 @@ by source validation before model construction. Preserve other datatype IRIs." (cond ((string= name "instanceOf") (read-instance-of child topic map)) ((string= name "name") (read-name child topic map)) + ((string= name "occurrence") (read-occurrence child topic map)) (t (setf topic (topic-maps.tmdm:add-topic-identifier topic (cond ((string= name "itemIdentity") :item-identifier) ((string= name "subjectIdentifier") :subject-identifier)