Changeset 447 for trunk/src/json/JTM

Timestamp:

05/02/11 15:05:19 (14 years ago)

Author:

lgiessmann

Message:

JTM: added unit-tests for exporting entire topic maps and the entire store as jtm 1.0 and 1.1 => fixed some bugs in the corresponding functions; xml-importer + rdf-importer: fixed a bug when creating instance-of associations => currently the topics type-instance, type, and instance is added to the topic map that the created instance-of association belongs to

File:

• trunk/src/json/JTM/jtm_tools.lisp (modified) (4 diffs)

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

@@ -92 +92 @@
                          (get-all-associations revision))))
                 (if version-1.1-p
-                    assocs
                     (set-difference
                      assocs
                      (loop for top in tm-tops
-                        append (instance-of-associations top :revision revision))))))
+                        append (instance-of-associations top :revision revision)))
+                    assocs)))
              (prefixes
               (when version-1.1-p
@@ -107 +107 @@
                                       (export-prefix-list-to-jtm prefixes) ",")))
              (iis (concat "\"item_identifiers\":"
-                          (export-identifiers-to-jtm
-                           tm :identifier-type 'ItemIdentifierC :prefixes prefixes
-                           :revision revision) ","))
+                          (if tm
+                              (export-identifiers-to-jtm
+                               tm :identifier-type 'ItemIdentifierC :prefixes prefixes
+                               :revision revision)
+                              "null") ","))
              (topics (concat "\"topics\":"
                              (export-topics-to-jtm
                               tm-tops :prefixes prefixes :instance-of-p version-1.1-p
-                              :item-type-p nil :revision revision)))
+                              :item-type-p nil :revision revision) ","))
              (assocs (concat "\"associations\":"
                              (export-associations-to-jtm
                               tm-assocs :prefixes prefixes
-                              :item-type-p nil :revision revision)))
-             (item-type (concat "\"item_type\":" item_type-topicmap ","))
+                              :item-type-p nil :revision revision) ","))
+             (item-type (concat "\"item_type\":\"" item_type-topicmap "\","))
              (tm-reifier
               (concat "\"reifier\":"
@@ -125 +127 @@
                                                  :revision revision)
                           "null"))))
-        (concat "{" version prefix-value iis topics assocs item-type tm-reifier"}")))))
+        (concat "{" version prefix-value iis topics assocs item-type tm-reifier 
+                "}")))))
              
              
@@ -133 +136 @@
   "Exports a topic map or all stored constructs as JTM file by calling
    export-as-jtm-string."
-  (declare (type (or Null String) jtm-path tm-id)
+  (declare (type (or Null String) tm-id)
+           (type (or String Pathname) jtm-path)
            (Symbol jtm-format)
            (Integer revision))