X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/35648c4dcc71e8dc6448b64abcacb438e53d64a2..aeb017e4f4846f2e6a701e581d20eef84a8b83d9:/src/tmdm/items.lisp?ds=inline diff --git a/src/tmdm/items.lisp b/src/tmdm/items.lisp index 57f480b..f9142d1 100644 --- a/src/tmdm/items.lisp +++ b/src/tmdm/items.lisp @@ -1,17 +1,17 @@ (in-package #:topic-maps.tmdm) -;;; Only Topic Map, Topic, unscoped Name, Association and Role properties used +;;; Only Topic Map, Topic, Name/Occurrence, Association and Role properties used ;;; by the current subset are materialized. ;;; Omitted set-valued properties are implicitly empty, single-valued ones null -;;; (CTM 3.2). In particular all supported names have empty scope and variants. +;;; (CTM 3.2). Variants remain implicitly empty; Scope is a materialized Topic set. (defstruct (topic-map (:constructor make-topic-map ()) (:conc-name %topic-map-)) topics associations) (defstruct (topic (:constructor %make-topic (parent)) (:conc-name %topic-)) - (parent nil :read-only t) item-identifiers subject-identifiers subject-locators names + (parent nil :read-only t) item-identifiers subject-identifiers subject-locators names occurrences ;; Implementation bookkeeping, not a TMDM property or another information item. forward) (defstruct (association (:constructor %make-association (parent type)) (:conc-name %association-)) - (parent nil :type topic-map :read-only t) (type nil :type topic) roles forward) + (parent nil :type topic-map :read-only t) (type nil :type topic) roles scope forward) (defstruct (association-role (:constructor %make-association-role (parent type player)) (:conc-name %association-role-)) (parent nil :type association) (type nil :type topic) (player nil :type topic) forward) @@ -19,7 +19,20 @@ (value "" :type string :read-only t) (type nil :type topic) (parent nil :type topic) - forward) + scope forward) + +(defstruct (occurrence (:constructor %make-occurrence (value datatype type parent)) + (:conc-name %occurrence-)) + (value "" :type string :read-only t) (datatype "" :type string :read-only t) + (type nil :type topic) (parent nil :type topic) item-identifiers scope forward) + +(defun canonical-occurrence (occurrence) + "Resolve a retained Occurrence replaced by TMDM duplicate removal; no compression." + (check-type occurrence occurrence) + (loop for current = occurrence then (%occurrence-forward current) + unless (%occurrence-forward current) return current)) +(defun string-datatype () "http://www.w3.org/2001/XMLSchema#string") +(defun iri-datatype () "http://www.w3.org/2001/XMLSchema#anyURI") (defun canonical-topic (topic) "Resolve a retained reference to a Topic replaced by same-map merging. @@ -53,8 +66,17 @@ EQ on obsolete objects does not change; compare their canonical representatives. (defun topic-subject-identifiers (topic) (copy-list (%topic-subject-identifiers (canonical-topic topic)))) (defun topic-subject-locators (topic) (copy-list (%topic-subject-locators (canonical-topic topic)))) (defun topic-names (topic) (copy-list (%topic-names (canonical-topic topic)))) +(defun topic-occurrences (topic) (copy-list (%topic-occurrences (canonical-topic topic)))) +(defun occurrence-value (item) (%occurrence-value (canonical-occurrence item))) +(defun occurrence-datatype (item) (%occurrence-datatype (canonical-occurrence item))) +(defun occurrence-parent (item) (%occurrence-parent (canonical-occurrence item))) +(defun occurrence-type (item) (%occurrence-type (canonical-occurrence item))) +(defun occurrence-item-identifiers (item) (copy-list (%occurrence-item-identifiers (canonical-occurrence item)))) (defun topic-name-value (name) (%topic-name-value (canonical-topic-name name))) (defun topic-name-type (name) (%topic-name-type (canonical-topic-name name))) +(defun topic-name-scope (name) (copy-list (%topic-name-scope (canonical-topic-name name)))) +(defun occurrence-scope (item) (copy-list (%occurrence-scope (canonical-occurrence item)))) +(defun association-scope (item) (copy-list (%association-scope (canonical-association item)))) (defun topic-name-parent (name) (%topic-name-parent (canonical-topic-name name))) (defun association-parent (association) (%association-parent (canonical-association association))) (defun association-type (association) (%association-type (canonical-association association))) @@ -89,3 +111,7 @@ EQ on obsolete objects does not change; compare their canonical representatives. (defun default-name-type-identifier () "http://psi.topicmaps.org/iso13250/model/topic-name") + +(defmethod print-object ((item occurrence) stream) + (print-unreadable-object (item stream :type t :identity t) + (format stream "~S datatype=~S" (occurrence-value item) (occurrence-datatype item))))