Changeset 449 for trunk/src/json/JTM

Timestamp:

05/03/11 08:21:49 (14 years ago)

Author:

lgiessmann

Message:

datamodel + unit-tests: added the function filter-type-instance-topics that takes a list of topics and a topic map object. The result value is a list of topics that contains no tmdm:type, tmdm:instance, and tmdm:type-instance topics, if they are not used as theme, type (in other constructs than type-instance-associations), player, and reifier => adopted the corresponding unit-tests

File:

• trunk/src/json/JTM/jtm_tools.lisp (modified) (1 diff)

trunk/src/json/JTM/jtm_tools.lisp ¶

@@ -80 +80 @@
       (let* ((tm-tops
               (if tm
-                  (delete-if #'(lambda(top)
-                                 (not (find-item-by-revision top revision)))
-                             (topics tm))
+                  (let ((inner-tops
+                         (delete-if #'(lambda(top)
+                                        (not (find-item-by-revision top revision)))
+                                    (topics tm))))
+                    (if (eql jtm-format :1.1)
+                        (filter-type-instance-topics inner-tops tm
+                                                     :revision revision)
+                        inner-tops))
                   (get-all-topics revision)))
              (tm-assocs