X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/5e716c078b885e97ebe858230ce7d8578e65ae4b..1691c8e0712e30666de2e667a5050eccb0086f71:/src/ctm/conditions.lisp diff --git a/src/ctm/conditions.lisp b/src/ctm/conditions.lisp index 0e08117..2f1842f 100644 --- a/src/ctm/conditions.lisp +++ b/src/ctm/conditions.lisp @@ -16,8 +16,9 @@ (error-line condition) (error-column condition) (error-message condition)) (dolist (frame (reverse (error-context condition))) - (when (eq :mergemap (getf frame :purpose)) - (format stream "~% via %mergemap in ~A at character ~D -> ~A~@[ (source ~A)~]" + (when (member (getf frame :purpose) '(:mergemap :include)) + (format stream "~% via %~(~A~) in ~A at character ~D -> ~A~@[ (source ~A)~]" + (getf frame :purpose) (or (getf frame :source) (getf frame :document-iri)) (getf frame :position) (getf frame :resource-iri) (getf frame :resource-source))))))) (define-condition ctm-rejection (ctm-error) ())