Changeset 77

Timestamp:

06/29/09 09:11:38 (16 years ago)

Author:

lgiessmann

Message:

json-server: fixed a bug with tmcl-type-validation when there is no topictype or no topictype-constraint or if they isn't either a topictype nor a topictype-constraint

Location:

trunk/src

Files:

• json/json_tmcl.lisp (modified) (1 diff)
• json/json_tmcl_validation.lisp (modified) (1 diff)
• rest_interface/set-up-json-interface.lisp (modified) (1 diff)

trunk/src/json/json_tmcl.lisp ¶

@@ -36 +36 @@
                     (get-constraints-of-topic topics :treat-as treat-as)))
                (concatenate 'string "\"topicConstraints\":" value))))
-        (let ((available-associations ;what's with association which have only a associationrole-constraints?
+        (let ((available-associations
                (remove-duplicates
                 (loop for topic in topics

trunk/src/json/json_tmcl_validation.lisp ¶

@@ -288 +288 @@
 
     (when (not topictype-constraint)
-      (return-from valid-instance-p topic-instance))
+      (return-from valid-instance-p (list topic-instance)))
 
     (when (and topictype-constraint

trunk/src/rest_interface/set-up-json-interface.lisp ¶

@@ -170 +170 @@
           (let ((json-data (hunchentoot:raw-post-data :external-format external-format :force-text t)))
             (handler-case (let ((psis
-                                 (json:decode-json-from-string json-data)))
-                            (let ((tmcl 
+                                 (json:decode-json-from-string json-data)))                         
+                            (let ((tmcl
                                    (json-tmcl:get-constraints-of-fragment psis :treat-as treat-as)))
                               (if tmcl