X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/d034a8deafa7cf74b2264ea8a7bd5cc0950806bf..49e4f2efb3df426d8ce249bc9b714bbd81323525:/src/xtm/reader.lisp?ds=inline diff --git a/src/xtm/reader.lisp b/src/xtm/reader.lisp index eebf157..5864bf0 100644 --- a/src/xtm/reader.lisp +++ b/src/xtm/reader.lisp @@ -124,7 +124,7 @@ constructs' complete subgrammars is made. XML errors have already been checked." ((string= name "name") (attributes node '("reifier") nil) (check-reifier node) - (let ((phase 0) (type-seen nil) (value-seen nil)) + (let ((phase 0) (type-seen nil) (scope-seen nil) (value-seen nil)) (dolist (child (elements node)) (check-namespace child) (let* ((kind (node-name child)) @@ -134,22 +134,75 @@ 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)) + ((string= kind "scope") + (when scope-seen (reject :duplicate-name-scope "Only one name scope is allowed." child)) + (setf scope-seen t)) ((string= kind "value") (when value-seen (reject :duplicate-name-value "Only one name value is allowed." child)) (setf value-seen t)) ;; Valid extension points remain explicitly unsupported. ;; Their complete subgrammars are outside this subset. (t (unsupported child))) - (validate child '("type" "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)) + ((string= name "resourceData") + (attributes node '("datatype") nil) + (let ((datatype (attr node "datatype"))) + ;; DATATYPE is already an absolute IRI, not content to + ;; resolve against the document or percent-normalize. + (when datatype + (unless (iri-parts-scheme (split-iri datatype)) + (reject :invalid-resource-data-datatype "resourceData datatype must be an absolute IRI." node)) + (validate-decoded-reference (unescape-reference datatype node) node) + (unless (member datatype (list (topic-maps.tmdm:string-datatype) (topic-maps.tmdm:iri-datatype)) :test #'equal) + (reject :resource-data-datatype "Only textual xsd:string and xsd:anyURI resourceData are implemented." node 'xtm-unsupported))) + (dolist (child (node-children node)) + (unless (stringp child) + (if (or (equal datatype (topic-maps.tmdm:iri-datatype)) (equal (node-uri child) +namespace+)) + (reject :unexpected-child + (if (equal datatype (topic-maps.tmdm:iri-datatype)) + "anyURI resourceData cannot contain child elements." + "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))) (unless (= 1 (length refs)) (reject :type-cardinality "type requires exactly one topicRef." node)) (validate (first refs) '("topicRef")))) + ((string= name "scope") + (attributes node nil nil) + (unless (elements node) (reject :empty-scope "scope requires at least one topicRef." node)) + (dolist (child (elements node)) (validate child '("topicRef")))) ((string= name "value") (attributes node nil nil) ;; VALUE accepts all character data, including empty text and @@ -181,18 +234,47 @@ 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=)) + (resource (find-if (lambda (child) (member (node-name child) '("resourceData" "resourceRef") :test #'string=)) children)) + (reference-p (string= (node-name resource) "resourceRef")) + (uri-data-p (and (not reference-p) (equal (attr resource "datatype") (topic-maps.tmdm:iri-datatype)))) + (explicit (mapcar (lambda (ref) (find-reference-topic map (reference-iri ref))) (elements scope-node))) + ;; A resource locator is a value, not a topic reference. LEAF-HREF uses + ;; the shared XTM IRI resolver without topic lookup or resource access. + (text (unless reference-p (with-output-to-string (out) + (dolist (part (node-children resource)) (write-string part out))))) + (value (cond (reference-p (leaf-href resource)) + (uri-data-p (resolve-iri text *document-iri* resource)) + (t text)))) + ;; 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 + :datatype (if (or reference-p uri-data-p) (topic-maps.tmdm:iri-datatype) (topic-maps.tmdm:string-datatype)) + :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=)) + (scope-node (find "scope" children :key #'node-name :test #'string=)) + (type (when type-node (find-reference-topic map (reference-iri (first (elements type-node)))))) + (scope (when scope-node (mapcar (lambda (ref) (find-reference-topic map (reference-iri ref))) + (elements scope-node)))) (value-node (find "value" children :key #'node-name :test #'string=)) (value (with-output-to-string (out) (dolist (part (node-children value-node)) (write-string part out))))) ;; SAX has already resolved XML character/entity references. Preserve the ;; resulting Unicode sequence without trimming or decoding it again. - (if type-node - (topic-maps.tmdm:add-name owner value - :type (find-reference-topic map (reference-iri (first (elements type-node))))) - (topic-maps.tmdm:add-default-name owner value)))) + ;; ADD-NAME owns canonical set semantics and normalization after merging. + (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"))))))