Author: lgiessmann Date: Thu Jun 17 12:37:12 2010 New Revision: 302 Log: new-datamodel: fixed two potential problems when requesting the db for all topics Modified: branches/new-datamodel/src/model/changes.lisp branches/new-datamodel/src/xml/xtm/exporter.lisp Modified: branches/new-datamodel/src/model/changes.lisp ============================================================================== --- branches/new-datamodel/src/model/changes.lisp (original) +++ branches/new-datamodel/src/model/changes.lisp Thu Jun 17 12:37:12 2010 @@ -225,7 +225,7 @@ :associations (find-associations-for-topic top :revision revision) ;TODO: this quite probably introduces code duplication with query: Check! :referenced-topics (find-referenced-topics top :revision revision) :topic top))) - (elephant:get-instances-by-class 'TopicC)))))) + (get-all-topics revision)))))) (defun get-fragment (unique-id) "get a fragment by its unique id" Modified: branches/new-datamodel/src/xml/xtm/exporter.lisp ============================================================================== --- branches/new-datamodel/src/xml/xtm/exporter.lisp (original) +++ branches/new-datamodel/src/xml/xtm/exporter.lisp Thu Jun 17 12:37:12 2010 @@ -18,7 +18,7 @@ (type-topic (identified-construct (elephant:get-instance-by-value 'PersistentIdC 'uri *type-psi*)))) - (loop for item in (elephant:get-instances-by-class 'AssociationC) + (loop for item in (d:get-all-associations revision) when (and (= (length (roles item :revision revision)) 2) (not (and (or (eq instance-topic (instance-of (first (roles item