((string= name "occurrence")
(attributes node '("reifier") nil)
(when (attr node "reifier")
- (resolve-iri (attr node "reifier") *document-iri* node)
- (reject :unsupported-construct "XTM occurrence reification is not implemented in this subset." node 'xtm-unsupported))
+ (resolve-iri (attr node "reifier") *document-iri* node))
(let ((phase 0) (type-seen nil) (scope-seen nil) (resource-seen nil))
(dolist (child (elements node))
(check-namespace child)
((member name '("association" "role") :test #'string=)
(attributes node '("reifier") nil)
(when (attr node "reifier")
- (resolve-iri (attr node "reifier") *document-iri* node)
- (reject :unsupported-construct
- (format nil "XTM ~A reification is not implemented in this subset." name) node 'xtm-unsupported))
+ (resolve-iri (attr node "reifier") *document-iri* node))
(let ((association-p (string= name "association"))
(phase 0) (type-seen nil) (scope-seen nil) (participants 0))
(dolist (child (elements node))
;; Match source metadata to the native Role by its complete signature
;; within THIS canonical Parent. Role order/II are not equality keys.
(loop for pair in (reverse roles) for source in (reverse role-nodes) do
+ ;; A preceding Role Reifier may have merged Topics and this Parent.
+ (setf association (topic-maps.tmdm:canonical-association association))
(let ((role (find-if (lambda (role)
(and (eq (topic-maps.tmdm:association-role-type role)
(topic-maps.tmdm:canonical-topic (first pair)))
(eq (topic-maps.tmdm:association-role-player role)
(topic-maps.tmdm:canonical-topic (second pair)))))
(topic-maps.tmdm:association-roles association))))
- (read-item-identities source role)))
- (topic-maps.tmdm:canonical-association association)))))
+ (setf role (read-item-identities source role))
+ (read-item-reifier source (topic-maps.tmdm:canonical-association-role role) map)))
+ ;; Role metadata is now on the native canonical Parent. Reifier merging
+ ;; may normalize it again; return the resulting Association handle.
+ (topic-maps.tmdm:canonical-association
+ (read-item-reifier node association map))))))
(defun read-resource-value (resource)
"Return value and datatype for a validated resource node (XTM 4.16/4.17).
This operation neither looks up Topics nor fetches resources. ANYTYPE is rejected
(resource (find-if (lambda (child) (member (node-name child) '("resourceData" "resourceRef") :test #'string=)) children)))
(multiple-value-bind (value datatype) (read-resource-value resource)
(topic-maps.tmdm:canonical-occurrence
- (read-item-identities node
- (topic-maps.tmdm:add-occurrence owner type value :datatype datatype :scope scope))))))
+ ;; Resolve Reifier by II only after native Occurrence normalization and
+ ;; II assignment. Reifier merging can normalize again: return its handle.
+ (read-item-reifier node
+ (read-item-identities node
+ (topic-maps.tmdm:add-occurrence owner type value :datatype datatype :scope scope)) map)))))
(defun read-topic (node map)
(let ((topic (topic-maps.tmdm:intern-topic map :item-identifier
(concatenate 'string *document-iri* "#" (collapse-space (attr node "id"))))))