X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/5d3ed0455de32b9d19ac791b9e4c4882a03c79b8..39c125bf9d462f538403aa633c56054511c210da:/src/xtm/reader.lisp diff --git a/src/xtm/reader.lisp b/src/xtm/reader.lisp index c3d0edc..d4fbef0 100644 --- a/src/xtm/reader.lisp +++ b/src/xtm/reader.lisp @@ -134,6 +134,7 @@ constructs' complete subgrammars is made. XML errors have already been checked." (reject :element-order "name child order is invalid." child)) (setf phase next) (cond + ((member kind '("itemIdentity" "variant") :test #'string=) nil) ((string= kind "type") (when type-seen (reject :duplicate-name-type "Only one name type is allowed." child)) (setf type-seen t)) @@ -146,8 +147,44 @@ constructs' complete subgrammars is made. XML errors have already been checked." ;; Valid extension points remain explicitly unsupported. ;; Their complete subgrammars are outside this subset. (t (unsupported child))) - (validate child '("type" "scope" "value")))) + (validate child '("itemIdentity" "type" "scope" "value" "variant")))) (unless value-seen (reject :missing-name-value "name requires a value element." node)))) + ((string= name "variant") + (attributes node '("reifier") nil) + (check-reifier node) + (let ((phase 0) (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 "scope") 1) + ((member kind '("resourceData" "resourceRef") :test #'string=) 2)))) + (unless next (reject :unexpected-element (format nil "Unexpected ~A element." kind) child)) + (when (< next phase) (reject :element-order "variant child order is invalid." child)) + (setf phase next) + (cond + ((string= kind "itemIdentity") (leaf-href child) (unsupported child)) + ((string= kind "scope") + (when scope-seen (reject :duplicate-variant-scope "Only one variant scope is allowed." child)) + (setf scope-seen t)) + (t + (unless scope-seen (reject :missing-variant-scope "variant requires scope before its resource." child)) + (when resource-seen (reject :variant-resource-cardinality "variant requires exactly one resource." child)) + (setf resource-seen t))) + (validate child '("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 "resourceRef") (leaf-href node) (unsupported node)) + ((string= name "resourceData") + (attributes node '("datatype") nil) + (when (and (attr node "datatype") + (not (equal (attr node "datatype") (topic-maps.tmdm:string-datatype)))) + (reject :resource-data-datatype "Only textual xsd:string resourceData is implemented." node 'xtm-unsupported)) + (dolist (child (node-children node)) + (unless (stringp child) + (if (equal (node-uri child) +namespace+) + (reject :unexpected-child "resourceData cannot contain XTM markup." child) + (reject :resource-data-markup "Embedded XML resourceData is outside this subset." child 'xtm-unsupported))))) ((string= name "type") (attributes node nil nil) (let ((refs (elements node))) @@ -188,6 +225,17 @@ constructs' complete subgrammars is made. XML errors have already been checked." (topic-maps.tmdm:make-association map (core-topic map "type-instance") (list (list (core-topic map "type") type) (list (core-topic map "instance") (topic-maps.tmdm:canonical-topic owner))))))) +(defun read-variant (node name map) + (let* ((children (elements node)) + (scope-node (find "scope" children :key #'node-name :test #'string=)) + (data-node (find "resourceData" children :key #'node-name :test #'string=)) + (explicit (mapcar (lambda (ref) (find-reference-topic map (reference-iri ref))) (elements scope-node))) + (value (with-output-to-string (out) + (dolist (part (node-children data-node)) (write-string part out))))) + ;; ADD-VARIANT canonicalizes the union and enforces the proper superset. + ;; A nonempty explicit scope may still add no theme to the Name scope. + (topic-maps.tmdm:add-variant name value + :scope (append (topic-maps.tmdm:topic-name-scope name) explicit)))) (defun read-name (node owner map) (let* ((children (elements node)) (type-node (find "type" children :key #'node-name :test #'string=)) @@ -201,10 +249,15 @@ constructs' complete subgrammars is made. XML errors have already been checked." ;; SAX has already resolved XML character/entity references. Preserve the ;; resulting Unicode sequence without trimming or decoding it again. ;; ADD-NAME owns canonical set semantics and normalization after merging. - (if type-node - (topic-maps.tmdm:add-name owner value - :type type :scope scope) - (topic-maps.tmdm:add-default-name owner value :scope scope)))) + (let ((name (if type-node + (topic-maps.tmdm:add-name owner value :type type :scope scope) + (topic-maps.tmdm:add-default-name owner value :scope scope)))) + ;; Item identifiers belong to the canonical Name, never its owner/type. + ;; Use the shared model API for set semantics and global conflicts. + (dolist (child children name) + (cond ((string= (node-name child) "itemIdentity") + (setf name (topic-maps.tmdm:add-item-identifier name (leaf-href child)))) + ((string= (node-name child) "variant") (read-variant child name map))))))) (defun read-topic (node map) (let ((topic (topic-maps.tmdm:intern-topic map :item-identifier (concatenate 'string *document-iri* "#" (collapse-space (attr node "id"))))))