[isidorus-cvs] r307 - branches/new-datamodel/src/json

[Lukas Giessmann]

Author: lgiessmann
Date: Fri Jul  2 12:44:02 2010
New Revision: 307

Log:
new-datamodel: adapted some functions of the rest-interface to the new datamodel, so it is possible to read fragments

Modified:
   branches/new-datamodel/src/json/json_tmcl.lisp
   branches/new-datamodel/src/json/json_tmcl_validation.lisp

Modified: branches/new-datamodel/src/json/json_tmcl.lisp
==============================================================================
--- branches/new-datamodel/src/json/json_tmcl.lisp	(original)
+++ branches/new-datamodel/src/json/json_tmcl.lisp	Fri Jul  2 12:44:02 2010
@@ -1757,7 +1757,8 @@
 		      (let ((l-is-type
 			     (handler-case
 				 (progn
-				   (topictype-p root topictype topictype-constraint)
+				   (topictype-p root topictype topictype-constraint
+						nil revision)
 				   t)
 			       (Condition () nil)))
 			    (l-is-instance

Modified: branches/new-datamodel/src/json/json_tmcl_validation.lisp
==============================================================================
--- branches/new-datamodel/src/json/json_tmcl_validation.lisp	(original)
+++ branches/new-datamodel/src/json/json_tmcl_validation.lisp	Fri Jul  2 12:44:02 2010
@@ -95,9 +95,8 @@
    topictype or it is an instanceOf of the topictype or it is a subtype of
    the topictype. TMDM 7.2 + TMDM 7.3"
   (declare (type (or integer null) revision)
-	   (TopicC topictype)
-	   (list checked-topics)
-	   (type (or TopicC null) topictype-constraint topictype))
+	   (type (or TopicC null) topictype topic-instance)
+	   (list checked-topics))
   (let ((current-checked-topics (append checked-topics (list topic-instance)))
 	(akos-of-this (get-direct-supertypes-of-topic topic-instance
 						      :revision revision))
@@ -308,10 +307,6 @@
    // ...
    The return value is a named list of the form (:subtypes (<topic> <...>)
    :checked-topics (<topic> <...>)"
-  (declare (type (or integer null) revision)
-	   (list checked-topics)
-	   (TopicC topic-instance)
-	   (type (or TopicC null) topictype topictype-constraint))
   (let ((current-checked-topics (append checked-topics (list topic-instance))))
     (handler-case (topictype-p topic-instance topictype topictype-constraint
 			       nil revision)
@@ -350,11 +345,9 @@
 		       (revision *TM-REVISION*))
   "Returns the topic-instance, all subtypes found by the function list-subtypes
    and all direct instances for the found subtypes."
-  (declare (type (or integer null) revision)
-	   (TopicC topic-instance)
-	   (type (or TopicC null) topictype topictype-constraint))
   (let ((all-subtypes-of-this
-	 (getf (list-subtypes topic-instance topictype topictype-constraint revision)
+	 (getf (list-subtypes topic-instance topictype topictype-constraint
+			      nil nil revision)
 	       :subtypes))
 	(type (get-item-by-psi *type-psi* :revision revision))
 	(instance (get-item-by-psi *instance-psi* :revision revision))