Changeset 242 for branches/new-datamodel

Timestamp:

03/21/10 19:25:42 (15 years ago)

Author:

lgiessmann

Message:

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

Location:

branches/new-datamodel/src

Files:

• json/json_importer.lisp (modified) (4 diffs)
• xml/xtm/importer.lisp (modified) (2 diffs)

branches/new-datamodel/src/json/json_importer.lisp ¶

@@ -69 +69 @@
       (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
@@ -128 +128 @@
           (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)))))
 
@@ -158 +158 @@
                                        :topicid (getf json-decoded-list :id)
                                        :xtm-id xtm-id)))
-          (add-to-topicmap tm top)
+          (add-to-tm tm top)
           top)))))
         
@@ -330 +330 @@
       (error "Error in the creation of an instanceof association: core topics are missing"))
 
-    (add-to-topicmap 
+    (add-to-tm 
      tm
      (make-construct 

branches/new-datamodel/src/xml/xtm/importer.lisp ¶

@@ -137 +137 @@
                  ((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
@@ -191 +191 @@
                        :message "could not find type topic (first player)"
                        :reference topicid-of-supertype)))
-    (add-to-topicmap 
+    (add-to-tm 
      tm
      (make-construct