Author: lgiessmann Date: Sun Mar 21 15:25:42 2010 New Revision: 242 Log: new-datamodel: changed some code sections that caused problems with the package "json" --> the compilation of isidorus succeeds now without errors and warnings but most likely there currently exist some semantic errors Modified: branches/new-datamodel/src/json/json_importer.lisp branches/new-datamodel/src/xml/xtm/importer.lisp Modified: branches/new-datamodel/src/json/json_importer.lisp ============================================================================== --- branches/new-datamodel/src/json/json_importer.lisp (original) +++ branches/new-datamodel/src/json/json_importer.lisp Sun Mar 21 15:25:42 2010 @@ -68,7 +68,7 @@ (declare (integer start-revision)) (declare (TopicMapC tm)) (setf roles (xml-importer::set-standard-role-types roles)) - (add-to-topicmap tm + (add-to-tm tm (make-construct 'AssociationC :start-revision start-revision :item-identifiers item-identifiers @@ -127,7 +127,7 @@ do (json-to-occurrence occurrence-values top start-revision)) (dolist (instanceOf-top instanceof-topics) (json-create-instanceOf-association instanceOf-top top start-revision :tm tm)) -; (add-to-topicmap tm top) ; will be done in "json-to-stub" +; (add-to-tm tm top) ; will be done in "json-to-stub" top))))) @@ -157,7 +157,7 @@ :psis subject-identifiers :topicid (getf json-decoded-list :id) :xtm-id xtm-id))) - (add-to-topicmap tm top) + (add-to-tm tm top) top))))) @@ -329,7 +329,7 @@ (unless (and associationtype roletype1 roletype2) (error "Error in the creation of an instanceof association: core topics are missing")) - (add-to-topicmap + (add-to-tm tm (make-construct 'AssociationC Modified: branches/new-datamodel/src/xml/xtm/importer.lisp ============================================================================== --- branches/new-datamodel/src/xml/xtm/importer.lisp (original) +++ branches/new-datamodel/src/xml/xtm/importer.lisp Sun Mar 21 15:25:42 2010 @@ -136,7 +136,7 @@ (let ((top (from-topic-elem-to-stub top-elem revision :xtm-id "core.xtm"))) - (add-to-topicmap tm top))))))) + (add-to-tm tm top))))))) ;TODO: replace the two importers with this macro (defmacro importer-mac @@ -190,7 +190,7 @@ (make-condition 'missing-reference-error :message "could not find type topic (first player)" :reference topicid-of-supertype))) - (add-to-topicmap + (add-to-tm tm (make-construct 'AssociationC