X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/4f7b4d26d40f8f5566594aa2e3ad6296d44fc4c3..f24ac27e1e1cc0118411b058d40af3c1c87f3ffb:/src/tmdm/variants.lisp diff --git a/src/tmdm/variants.lisp b/src/tmdm/variants.lisp index bafa485..b67e711 100644 --- a/src/tmdm/variants.lisp +++ b/src/tmdm/variants.lisp @@ -40,7 +40,7 @@ Reject scope collapse atomically; TMDM specifies the invariant, not this API pol (defun normalize-variants (map) "TMDM 5.5/6.4: remove equal Variants under each current Parent Name. -Reifier is null and Item Identifiers empty in this subset." + Reifier remains null; Item Identifiers are unioned, not equality keys." (dolist (topic (%topic-map-topics map)) (dolist (name (%topic-names topic)) (loop for pair = (equal-pair (%topic-name-variants name) @@ -52,6 +52,7 @@ Reifier is null and Item Identifiers empty in this subset." (let* ((a (first pair)) (b (second pair)) (c (%make-variant (%variant-value a) (%variant-datatype a) name))) (setf (%variant-scope c) (copy-list (%variant-scope a)) + (%variant-item-identifiers c) (set-union (%variant-item-identifiers a) (%variant-item-identifiers b) #'string=) (%topic-name-variants name) (replace-pair (%topic-name-variants name) a b c) (%variant-forward a) c (%variant-forward b) c))))) map)