[isidorus-cvs] r871 - branches/gdl-frontend/src/rest_interface

[lgiessmann at common-lisp.net]

Author: lgiessmann
Date: Mon Sep 12 02:31:58 2011
New Revision: 871

Log:
gdl-backend: removed the json-interface-caching mechanism of the gdl-frontend (for now)

Modified:
   branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp
   branches/gdl-frontend/src/rest_interface/set-up-json-interface.lisp

Modified: branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp
==============================================================================
--- branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp	Mon Sep 12 02:19:01 2011	(r870)
+++ branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp	Mon Sep 12 02:31:58 2011	(r871)
@@ -125,17 +125,9 @@
 	    (with-writer-lock
 	      (let ((result (jtm-delete-interface:mark-as-deleted-from-jtm
 			     json-data :revision (get-revision))))
-		(if result
-		    (progn
-		      (when (typep result 'd:TopicC)
-			(append ;;the append function is used only for suppress
-			        ;;style warnings of unused delete return values
-			 (delete (elephant::oid result) *type-table*)
-			 (delete (elephant::oid result) *instance-table*)))
-		      (format nil "")) ;operation succeeded
-		    (progn
-		      (setf (hunchentoot:return-code*) hunchentoot:+http-not-found+)
-		      (format nil "object not found")))))))
+	       (unless result
+		 (setf (hunchentoot:return-code*) hunchentoot:+http-not-found+)
+		 (format nil "object not found"))))))
 	(setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+))))
 
 
@@ -150,10 +142,8 @@
 		 (hunchentoot:raw-post-data :external-format external-format
 					    :force-text t)))
 	    (with-writer-lock 
-	      (let ((frag (jtm-importer:import-construct-from-jtm-string
-			   json-data :revision (get-revision) :tm-id *gdl-tm-id*)))
-		(when frag
-		  (push-to-cache (d:topic frag)))))))
+	      (jtm-importer:import-construct-from-jtm-string
+	       json-data :revision (get-revision) :tm-id *gdl-tm-id*))))
 	(setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+))))
 
 

Modified: branches/gdl-frontend/src/rest_interface/set-up-json-interface.lisp
==============================================================================
--- branches/gdl-frontend/src/rest_interface/set-up-json-interface.lisp	Mon Sep 12 02:19:01 2011	(r870)
+++ branches/gdl-frontend/src/rest_interface/set-up-json-interface.lisp	Mon Sep 12 02:31:58 2011	(r871)
@@ -578,11 +578,11 @@
     (handler-case (progn
 		    (json-tmcl::topictype-p
 		     topic-instance topictype topictype-constraint nil 0)
-		    (push (elephant::oid topic-instance) *type-table*))
+		    (pushnew (elephant::oid topic-instance) *type-table*))
       (condition () nil)))
   (handler-case (progn
 		  (json-tmcl::valid-instance-p topic-instance nil nil 0)
-		  (push (elephant::oid topic-instance) *instance-table*))
+		  (pushnew (elephant::oid topic-instance) *instance-table*))
     (condition () nil)))