[isidorus-cvs] r805 - trunk/src/json/JTM

[lgiessmann at common-lisp.net]

Author: lgiessmann
Date: Tue Aug 30 00:46:40 2011
New Revision: 805

Log:


Modified:
   trunk/src/json/JTM/jtm_tools.lisp

Modified: trunk/src/json/JTM/jtm_tools.lisp
==============================================================================
--- trunk/src/json/JTM/jtm_tools.lisp	Mon Aug 29 23:54:31 2011	(r804)
+++ trunk/src/json/JTM/jtm_tools.lisp	Tue Aug 30 00:46:40 2011	(r805)
@@ -111,19 +111,19 @@
 			inner-tops))
 		  (get-all-topics revision)))
 	     (tm-assocs
-	      (xtm-exporter::list-extern-associations :revision revision))
-	             ;(let ((assocs
-		     ;(if tm
-		     ;(delete-if #'(lambda(assoc)
-		     ;(not (find-item-by-revision assoc revision)))
-		     ;(associations tm))
-		     ;(get-all-associations revision))))
-		     ;(if version-1.1-p
-		     ;(set-difference
-		     ;assocs
-		     ;(loop for top in tm-tops
-		     ;append (instance-of-associations top :revision revision)))
-		     ;assocs)))
+	      ;(xtm-exporter::list-extern-associations :revision revision))
+	      (let ((assocs
+		     (if tm
+			 (delete-if #'(lambda(assoc)
+					(not (find-item-by-revision assoc revision)))
+				    (associations tm))
+			 (get-all-associations revision))))
+		(if version-1.1-p
+		    (set-difference
+		     assocs
+		     (loop for top in tm-tops
+			append (instance-of-associations top :revision revision)))
+		    assocs)))
 	     (prefixes
 	      (when version-1.1-p
 		(create-prefix-list-for-tm tm-tops tm-assocs tm :revision revision)))