X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/39c125bf9d462f538403aa633c56054511c210da..9daceb816dbd75446ecb8ec0ef4cb5413d381588:/src/xtm/reader.lisp?ds=inline diff --git a/src/xtm/reader.lisp b/src/xtm/reader.lisp index d4fbef0..767395a 100644 --- a/src/xtm/reader.lisp +++ b/src/xtm/reader.lisp @@ -90,7 +90,8 @@ constructs' complete subgrammars is made. XML errors have already been checked." (attributes node '("version" "reifier") '("version")) (unless (equal (attr node "version") "2.0") (reject :invalid-version "This reader accepts XTM version 2.0 only." node)) - (check-reifier node) + (when (attr node "reifier") + (resolve-iri (attr node "reifier") *document-iri* node)) (let ((phase 0)) (dolist (child (elements node)) (let* ((name (node-name child)) @@ -123,7 +124,8 @@ constructs' complete subgrammars is made. XML errors have already been checked." (dolist (child (elements node)) (validate child '("topicRef")))) ((string= name "name") (attributes node '("reifier") nil) - (check-reifier node) + (when (attr node "reifier") + (resolve-iri (attr node "reifier") *document-iri* node)) (let ((phase 0) (type-seen nil) (scope-seen nil) (value-seen nil)) (dolist (child (elements node)) (check-namespace child) @@ -163,7 +165,7 @@ constructs' complete subgrammars is made. XML errors have already been checked." (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 "itemIdentity") nil) ((string= kind "scope") (when scope-seen (reject :duplicate-variant-scope "Only one variant scope is allowed." child)) (setf scope-seen t)) @@ -171,20 +173,29 @@ constructs' complete subgrammars is made. XML errors have already been checked." (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")))) + (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 "resourceRef") (leaf-href node) (unsupported node)) + ((string= name "resourceRef") (leaf-href 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))))) + (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))) @@ -216,6 +227,20 @@ constructs' complete subgrammars is made. XML errors have already been checked." (topic-maps.tmdm:topic-map-topics map)))) (if topic (topic-maps.tmdm:canonical-topic topic) (topic-maps.tmdm:intern-topic map :item-identifier iri)))) +(defun read-item-reifier (node item map) + ;; XTM 4.3.2 looks up Item Identifiers only, unlike topicRef (4.20). + ;; INTERN-TOPIC adds the II on a miss; any SI/II identity merging then + ;; follows the existing TMDM rules, independently of this lookup. + (when (attr node "reifier") + (let* ((iri (resolve-iri (attr node "reifier") *document-iri* node)) + (topic (or (find iri (topic-maps.tmdm:topic-map-topics map) + :test (lambda (iri topic) + (member iri (topic-maps.tmdm:topic-item-identifiers topic) :test #'string=))) + (topic-maps.tmdm:intern-topic map :item-identifier iri)))) + (return-from read-item-reifier (topic-maps.tmdm:set-item-reifier item topic)))) + item) +(defun read-map-reifier (node map) + (read-item-reifier node map map)) (defun core-topic (map local) (topic-maps.tmdm:intern-topic map :subject-identifier (concatenate 'string "http://psi.topicmaps.org/iso13250/model/" local))) @@ -228,14 +253,27 @@ constructs' complete subgrammars is made. XML errors have already been checked." (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=)) + (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))) - (value (with-output-to-string (out) - (dolist (part (node-children data-node)) (write-string part out))))) + ;; 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 - :scope (append (topic-maps.tmdm:topic-name-scope name) explicit)))) + (let ((variant (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)))) + ;; Normalize first: an equal Variant may already own this identifier. + ;; Keep the native canonical result and its global conflict conditions. + (dolist (child children variant) + (when (string= (node-name child) "itemIdentity") + (setf variant (topic-maps.tmdm:add-item-identifier variant (leaf-href child)))))))) (defun read-name (node owner map) (let* ((children (elements node)) (type-node (find "type" children :key #'node-name :test #'string=)) @@ -254,10 +292,16 @@ constructs' complete subgrammars is made. XML errors have already been checked." (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))))))) + (dolist (child children) + (when (string= (node-name child) "itemIdentity") + (setf name (topic-maps.tmdm:add-item-identifier name (leaf-href child))))) + ;; ADD-NAME may have returned an existing canonical Name. Reifier + ;; resolution/merging can normalize it again: retain the native result + ;; before processing Variants and return the current Name handle. + (setf name (read-item-reifier node name map)) + (dolist (child children) + (when (string= (node-name child) "variant") (read-variant child name map))) + (topic-maps.tmdm:canonical-topic-name name)))) (defun read-topic (node map) (let ((topic (topic-maps.tmdm:intern-topic map :item-identifier (concatenate 'string *document-iri* "#" (collapse-space (attr node "id")))))) @@ -295,6 +339,8 @@ distinct. No resources are fetched. No externally supplied Map is mutated." :line (sax:line-number handler) :column (sax:column-number handler))))) (map (topic-maps.tmdm:make-topic-map))) (validate-source root) + ;; The attribute is processed before itemIdentity and later Topic nodes. + (read-map-reifier root map) (dolist (child (elements root)) (if (string= (node-name child) "itemIdentity") (topic-maps.tmdm:add-item-identifier map (leaf-href child))