X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/da36095dddc1354ee8558dc9d729f5cb2fe53ff5..9daceb816dbd75446ecb8ec0ef4cb5413d381588:/src/xtm/reader.lisp?ds=sidebyside diff --git a/src/xtm/reader.lisp b/src/xtm/reader.lisp index acd1353..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) @@ -225,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))) @@ -276,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")))))) @@ -317,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))