[isidorus-cvs] r880 - branches/gdl-frontend/src/json/JTM

[lgiessmann at common-lisp.net]

Author: lgiessmann
Date: Tue Sep 13 00:11:38 2011
New Revision: 880

Log:
jtm-importer: fixed a bug with the "parent" member

Modified:
   branches/gdl-frontend/src/json/JTM/jtm_importer.lisp

Modified: branches/gdl-frontend/src/json/JTM/jtm_importer.lisp
==============================================================================
--- branches/gdl-frontend/src/json/JTM/jtm_importer.lisp	Tue Sep 13 00:10:27 2011	(r879)
+++ branches/gdl-frontend/src/json/JTM/jtm_importer.lisp	Tue Sep 13 00:11:38 2011	(r880)
@@ -76,7 +76,7 @@
 	  ((string= item_type item_type-topic)
 	   (import-topic-stub-from-jtm-list jtm-list nil :revision revision
 					    :prefixes prefixes)
-	   (merge-topic-from-jtm-list jtm-list nil :instance-of-p format-1.1-p
+	   (merge-topic-from-jtm-list jtm-list :instance-of-p format-1.1-p
 				      :revision revision :prefixes prefixes))
 	  ((string= item_type item_type-name)
 	   (import-name-from-jtm-list jtm-list nil :revision revision
@@ -347,12 +347,12 @@
 	   (Integer revision))
   (map 'list #'(lambda(jtm-list)
 		 (merge-topic-from-jtm-list
-		  jtm-list parents :revision revision :prefixes prefixes
+		  jtm-list :revision revision :prefixes prefixes
 		  :instance-of-p instance-of-p))
        jtm-lists))
 
 
-(defun merge-topic-from-jtm-list(jtm-list parents &key (instance-of-p t)
+(defun merge-topic-from-jtm-list(jtm-list &key (instance-of-p t)
 				  (revision *TM-REVISION*) prefixes)
   "Creates and returns a topic object from the passed jtm
    list generated by json:decode-json-from-string.
@@ -360,7 +360,7 @@
    topic maps, it is only needed for the instance-of-associations -
    topics are added in the function import-topic-stubs-from-jtm-lists
    to their topic map elements."
-  (declare (List jtm-list prefixes parents)
+  (declare (List jtm-list prefixes)
 	   (Boolean instance-of-p)
 	   (Integer revision))
   (let* ((ids (append (get-item :ITEM--IDENTIFIERS jtm-list)
@@ -388,7 +388,9 @@
     (when (and (not instance-of-p) instanceof)
       (error (make-condition 'JTM-error :message (format nil "From merge-topic-from-jtm-list(): the JTM-topic has an instance_of member set, but JTM version 1.0 does not allow an intance_of member within a topic object: ~a" jtm-list))))
     (dolist (type-top instanceof)
-      (make-instance-of-association top type-top parents :revision revision))
+      (make-instance-of-association
+       top type-top (in-topicmaps top :revision revision)
+       :revision revision))
     (dolist (name top-names)
       (add-name top name :revision revision))
     (dolist (occ top-occs)