isidorus-cvs

Download

isidorus-cvs@common-lisp.net

February 2010

1 participants
42 discussions

[isidorus-cvs] r177 - trunk/src/json
by Lukas Giessmann 03 Feb '10

03 Feb '10

Author: lgiessmann Date: Wed Feb 3 09:54:01 2010 New Revision: 177 Log: fixed a problem in the json/ajax-interface: imported data can be restored after a system crash now -> the fragment is imported within the macro (elephant:ensure-transaction (:txn-nosync nil), since the store-controller can't be closed to ensure a succesful transaction Modified: trunk/src/json/json_importer.lisp Modified: trunk/src/json/json_importer.lisp ============================================================================== --- trunk/src/json/json_importer.lisp (original) +++ trunk/src/json/json_importer.lisp Wed Feb 3 09:54:01 2010 @@ -32,13 +32,13 @@ (topicStubs-values (getf fragment-values :topicStubs)) (associations-values (getf fragment-values :associations)) (rev (get-revision))) ; creates a new revision, equal for all elements of the passed fragment -; (xtm-id "json-xtm")) - (xml-importer:with-tm (rev xtm-id (first (getf fragment-values :tm-ids))) - (loop for topicStub-values in (append topicStubs-values (list topic-values)) - do (json-to-stub topicStub-values rev :tm xml-importer::tm :xtm-id xtm-id)) - (json-merge-topic topic-values rev :tm xml-importer::tm :xtm-id xtm-id) - (loop for association-values in associations-values - do (json-to-association association-values rev :tm xml-importer::tm))))))) + (elephant:ensure-transaction (:txn-nosync nil) + (xml-importer:with-tm (rev xtm-id (first (getf fragment-values :tm-ids))) + (loop for topicStub-values in (append topicStubs-values (list topic-values)) + do (json-to-stub topicStub-values rev :tm xml-importer::tm :xtm-id xtm-id)) + (json-merge-topic topic-values rev :tm xml-importer::tm :xtm-id xtm-id) + (loop for association-values in associations-values + do (json-to-association association-values rev :tm xml-importer::tm)))))))) (defun json-to-association (json-decoded-list start-revision

1 0

[isidorus-cvs] r176 - trunk/src/rest_interface
by Lukas Giessmann 03 Feb '10

03 Feb '10

Author: lgiessmann Date: Wed Feb 3 08:32:19 2010 New Revision: 176 Log: changed a variable in the restful interface that is needed for the generation of rdf-data Modified: trunk/src/rest_interface/rest-interface.lisp trunk/src/rest_interface/set-up-json-interface.lisp Modified: trunk/src/rest_interface/rest-interface.lisp ============================================================================== --- trunk/src/rest_interface/rest-interface.lisp (original) +++ trunk/src/rest_interface/rest-interface.lisp Wed Feb 3 08:32:19 2010 @@ -27,6 +27,7 @@ :start-tm-engine :shutdown-tm-engine :*json-get-prefix* + :*get-rdf-prefix* :*json-commit-url* :*json-get-all-psis* :*json-get-summary-prefix* Modified: trunk/src/rest_interface/set-up-json-interface.lisp ============================================================================== --- trunk/src/rest_interface/set-up-json-interface.lisp (original) +++ trunk/src/rest_interface/set-up-json-interface.lisp Wed Feb 3 08:32:19 2010 @@ -10,7 +10,7 @@ (in-package :rest-interface) (defparameter *json-get-prefix* "/json/get/(.+)$") ;the prefix to get a fragment by the psi -> localhost:8000/json/get/<fragment-psi> -(defparameter *json-get-rdf-prefix* "/json/get/rdf/(.+)$") ;the prefix to get a fragment by the psi -> localhost:8000/json/rdf/get/<fragment-psi> +(defparameter *get-rdf-prefix* "/json/get/rdf/(.+)$") ;the prefix to get a fragment by the psi -> localhost:8000/json/rdf/get/<fragment-psi> (defparameter *json-commit-url* "/json/commit/?$") ;the url to commit a json fragment by "put" or "post" (defparameter *json-get-all-psis* "/json/psis/?$") ;the url to get all topic psis of isidorus -> localhost:8000/json/psis (defparameter *json-get-summary-url* "/json/summary/?$") ;the url to get a summary of all topic stored in isidorus; you have to set the GET-parameter "start" for the start index of all topics within elephant and the GET-paramter "end" for the last index of the topic sequence -> http://localhost:8000/json/summary/?start=12&end=13 @@ -28,7 +28,7 @@ (defparameter *ajax-javascript-url-prefix* "/javascripts") ; the url prefix of all javascript files (defun set-up-json-interface (&key (json-get-prefix *json-get-prefix*) - (json-get-rdf-prefix *json-get-rdf-prefix*) + (get-rdf-prefix *get-rdf-prefix*) (json-get-all-psis *json-get-all-psis*) (json-commit-url *json-commit-url*) (json-get-summary-url *json-get-summary-url*) @@ -82,7 +82,7 @@ (create-regex-dispatcher json-get-prefix #'return-json-fragment) hunchentoot:*dispatch-table*) (push - (create-regex-dispatcher json-get-rdf-prefix #'return-json-rdf-fragment) + (create-regex-dispatcher get-rdf-prefix #'return-json-rdf-fragment) hunchentoot:*dispatch-table*) (push (create-regex-dispatcher json-get-topic-stub-prefix #'return-topic-stub-of-psi)

1 0