- (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.
- (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)
- (when (string= (node-name child) "itemIdentity")
- (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)))))
+ (explicit (mapcar (lambda (ref) (find-reference-topic map (reference-iri ref))) (elements scope-node))))
+ (multiple-value-bind (value datatype) (read-resource-value resource)
+ ;; ADD-VARIANT owns canonicalization and the proper-superset constraint.
+ (let ((variant (topic-maps.tmdm:add-variant name value :datatype datatype
+ :scope (append (topic-maps.tmdm:topic-name-scope name) explicit))))
+ (dolist (child children)
+ (when (string= (node-name child) "itemIdentity")
+ (setf variant (topic-maps.tmdm:add-item-identifier variant (leaf-href child)))))
+ ;; Reification may normalize again; retain the native canonical handle.
+ (topic-maps.tmdm:canonical-variant (read-item-reifier node variant map))))))