(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))
(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)
(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))
(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))
(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)))
(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))))
+ (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=))
(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"))))))
: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))