(defun unsupported (node)
(reject :unsupported-construct (format nil "XTM ~A is not implemented in this subset." (node-name node))
node 'xtm-unsupported))
-(defun check-reifier (node)
- (when (attr node "reifier")
- (reject :reification "XTM Reification is outside this subset." node 'xtm-unsupported)))
(defun leaf-href (node)
(attributes node '("href") '("href"))
(when (elements node) (reject :unexpected-child "A locator element must be empty." node))
(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)
(unless value-seen (reject :missing-name-value "name requires a value element." node))))
((string= name "variant")
(attributes node '("reifier") nil)
- (check-reifier node)
+ (when (attr node "reifier") (resolve-iri (attr node "reifier") *document-iri* node))
(let ((phase 0) (scope-seen nil) (resource-seen nil))
(dolist (child (elements node))
(check-namespace child)
(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-map-reifier (node map)
+(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.
:test (lambda (iri topic)
(member iri (topic-maps.tmdm:topic-item-identifiers topic) :test #'string=)))
(topic-maps.tmdm:intern-topic map :item-identifier iri))))
- (topic-maps.tmdm:set-item-reifier map topic)))
- map)
+ (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)))
: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)
+ (dolist (child children)
(when (string= (node-name child) "itemIdentity")
- (setf variant (topic-maps.tmdm:add-item-identifier variant (leaf-href child))))))))
+ (setf variant (topic-maps.tmdm:add-item-identifier variant (leaf-href child)))))
+ ;; Reification may merge Topics and normalize this Variant again.
+ ;; Reuse the II-only resolver and retain its current native result.
+ (topic-maps.tmdm:canonical-variant (read-item-reifier node variant map)))))
(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"))))))