September 2011 - isidorus-cvs@common-lisp.net

[isidorus-cvs] r927 - branches/gdl-frontend/src/rest_interface
by lgiessmann＠common-lisp.net 19 Sep '11

19 Sep '11

Author: lgiessmann Date: Mon Sep 19 08:13:36 2011 New Revision: 927 Log: gdl-frontend: added the compiled files for the textgrid serviceregistry ui Modified: branches/gdl-frontend/src/rest_interface/rest-interface.lisp branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Modified: branches/gdl-frontend/src/rest_interface/rest-interface.lisp ============================================================================== --- branches/gdl-frontend/src/rest_interface/rest-interface.lisp Mon Sep 19 07:48:01 2011 (r926) +++ branches/gdl-frontend/src/rest_interface/rest-interface.lisp Mon Sep 19 08:13:36 2011 (r927) @@ -59,8 +59,7 @@ :*gdl-host-address-hash-object* :*gdl-host-address-environment* :*gdl-base-path* - :*gdl-host-file-hash-object* - :*gdl-host-file-environment* + :*gdl-host-file* :*gdl-tm-id* :*gdl-sparql*)) 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 19 07:48:01 2011 (r926) +++ branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Mon Sep 19 08:13:36 2011 (r927) @@ -16,8 +16,7 @@ (defparameter *gdl-host-address-hash-object* "/hash-object") (defparameter *gdl-host-address-environment* "/environment") (defparameter *gdl-base-path* "anaToMia/hosted_files/") -(defparameter *gdl-host-file-hash-object* (concat *gdl-base-path* "hash-object-ui/GDL_Widgets.html")) -(defparameter *gdl-host-file-environment* (concat *gdl-base-path* "environment-ui/GDL_Widgets.html")) +(defparameter *gdl-host-file* (concat *gdl-base-path* "GDL_Widgets.html")) (defparameter *gdl-tm-id* "http://textgrid.org/serviceregistry/gdl-frontend/gdl-tm") (defparameter *gdl-sparql* "/gdl/tm-sparql/?$") @@ -30,12 +29,10 @@ (base-path *gdl-base-path*) (host-address-hash-object *gdl-host-address-hash-object*) (host-address-environment *gdl-host-address-environment*) - (host-file-hash-object *gdl-host-file-hash-object*) - (host-file-environment *gdl-host-file-environment*)) + (host-file *gdl-host-file*)) (declare (String get-fragment get-schema commit-fragment delete-fragment host-address-hash-object - host-address-environment host-file-hash-object - host-file-environment)) + host-address-environment host-file)) ;(init-cache nil) ;(format t "~%") @@ -47,8 +44,9 @@ ;; e.g. a json error-message. (push hunchentoot:+http-internal-server-error+ hunchentoot:*approved-return-codes*) - (init-hosted-files :host-address host-address-hash-object :host-file host-file-hash-object - :base-path (concat base-path "hash-object-ui/")) + (init-hosted-files :host-address-hash-object host-address-hash-object + :host-address-environment host-address-environment + :host-file host-file :base-path base-path) (push (create-regex-dispatcher get-fragment #'return-json-fragment-handler) @@ -71,11 +69,13 @@ hunchentoot:*dispatch-table*)) -(defun init-hosted-files (&key (host-address *gdl-host-address-hash-object*) - (host-file *gdl-host-file-hash-object*) +(defun init-hosted-files (&key (host-address-hash-object *gdl-host-address-hash-object*) + (host-address-environment *gdl-host-address-environment*) + (host-file *gdl-host-file*) (base-path *gdl-base-path*)) "Adds handlers for the css, html and js files needed by the frontend." - (declare (String host-address host-file base-path)) + (declare (String host-address-hash-object host-address-environment + host-file base-path)) ;; add the actual html file (let ((full-host-path (concat (namestring @@ -88,7 +88,11 @@ base-path))) (push (create-static-file-dispatcher-and-handler - host-address full-host-path "text/html") + host-address-hash-object full-host-path "text/html") + hunchentoot:*dispatch-table*) + (push + (create-static-file-dispatcher-and-handler + host-address-environment full-host-path "text/html") hunchentoot:*dispatch-table*) ; add all additional files (let ((absolute-base-path-len (length absolute-base-path)))

1 0

[isidorus-cvs] r926 - branches/gdl-frontend/src/rest_interface
by lgiessmann＠common-lisp.net 19 Sep '11

19 Sep '11

Author: lgiessmann Date: Mon Sep 19 07:48:01 2011 New Revision: 926 Log: Modified: branches/gdl-frontend/src/rest_interface/rest-interface.lisp branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Modified: branches/gdl-frontend/src/rest_interface/rest-interface.lisp ============================================================================== --- branches/gdl-frontend/src/rest_interface/rest-interface.lisp Mon Sep 19 07:46:18 2011 (r925) +++ branches/gdl-frontend/src/rest_interface/rest-interface.lisp Mon Sep 19 07:48:01 2011 (r926) @@ -56,9 +56,11 @@ :*gdl-get-schema* :*gdl-commit-fragment* :*gdl-delete-fragment* - :*gdl-host-address* + :*gdl-host-address-hash-object* + :*gdl-host-address-environment* :*gdl-base-path* - :*gdl-host-file* + :*gdl-host-file-hash-object* + :*gdl-host-file-environment* :*gdl-tm-id* :*gdl-sparql*)) 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 19 07:46:18 2011 (r925) +++ branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Mon Sep 19 07:48:01 2011 (r926) @@ -13,11 +13,13 @@ (defparameter *gdl-get-schema* "/gdl/schema/?$") (defparameter *gdl-commit-fragment* "/gdl/commit/?") (defparameter *gdl-delete-fragment* "/gdl/delete/?") -(defparameter *gdl-host-address* "/anatomia") +(defparameter *gdl-host-address-hash-object* "/hash-object") +(defparameter *gdl-host-address-environment* "/environment") (defparameter *gdl-base-path* "anaToMia/hosted_files/") -(defparameter *gdl-host-file* (concat *gdl-base-path* "GDL_Widgets.html")) +(defparameter *gdl-host-file-hash-object* (concat *gdl-base-path* "hash-object-ui/GDL_Widgets.html")) +(defparameter *gdl-host-file-environment* (concat *gdl-base-path* "environment-ui/GDL_Widgets.html")) (defparameter *gdl-tm-id* "http://textgrid.org/serviceregistry/gdl-frontend/gdl-tm") -(defparameter *gdl-sparql* "/gdl/sparql/?$") +(defparameter *gdl-sparql* "/gdl/tm-sparql/?$") (defun set-up-gdl-interface (&key (get-fragment *gdl-get-fragment*) @@ -26,10 +28,14 @@ (delete-fragment *gdl-delete-fragment*) (gdl-sparql *gdl-sparql*) (base-path *gdl-base-path*) - (host-address *gdl-host-address*) - (host-file *gdl-host-file*)) + (host-address-hash-object *gdl-host-address-hash-object*) + (host-address-environment *gdl-host-address-environment*) + (host-file-hash-object *gdl-host-file-hash-object*) + (host-file-environment *gdl-host-file-environment*)) (declare (String get-fragment get-schema commit-fragment - delete-fragment host-address)) + delete-fragment host-address-hash-object + host-address-environment host-file-hash-object + host-file-environment)) ;(init-cache nil) ;(format t "~%") @@ -41,8 +47,8 @@ ;; e.g. a json error-message. (push hunchentoot:+http-internal-server-error+ hunchentoot:*approved-return-codes*) - (init-hosted-files :host-address host-address :host-file host-file - :base-path base-path) + (init-hosted-files :host-address host-address-hash-object :host-file host-file-hash-object + :base-path (concat base-path "hash-object-ui/")) (push (create-regex-dispatcher get-fragment #'return-json-fragment-handler) @@ -65,8 +71,8 @@ hunchentoot:*dispatch-table*)) -(defun init-hosted-files (&key (host-address *gdl-host-address*) - (host-file *gdl-host-file*) +(defun init-hosted-files (&key (host-address *gdl-host-address-hash-object*) + (host-file *gdl-host-file-hash-object*) (base-path *gdl-base-path*)) "Adds handlers for the css, html and js files needed by the frontend." (declare (String host-address host-file base-path)) @@ -94,6 +100,7 @@ (let* ((rel-addr (subseq (namestring item) absolute-base-path-len)) (content-type (generate-content-type (file-namestring item))) (rel-uri (concat "/" rel-addr))) + (format t "rel-addr: ~a~%rel-uri: ~a~%~%" rel-addr rel-uri) (push (create-static-file-dispatcher-and-handler rel-uri item content-type)

1 0

[isidorus-cvs] r925 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: . isidorus
by lgiessmann＠common-lisp.net 19 Sep '11

19 Sep '11

Author: lgiessmann Date: Mon Sep 19 07:46:18 2011 New Revision: 925 Log: gdl-frontend: Widgets: added a new entry point => currently one compiled application is enough, since the ciorrect page will be generated depending on the requested url Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusEntryPoint.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml Mon Sep 19 03:20:11 2011 (r924) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml Mon Sep 19 07:46:18 2011 (r925) @@ -19,8 +19,10 @@   - <entry-point class="us.isidor.gdl.anaToMia.Widgets.isidorus.HashObjectUi"/> +   + <entry-point class='us.isidor.gdl.anaToMia.Widgets.isidorus.IsidorusEntryPoint'/> +  <source path="base"/> Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusEntryPoint.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusEntryPoint.java Mon Sep 19 07:46:18 2011 (r925) @@ -0,0 +1,21 @@ +package us.isidor.gdl.anaToMia.Widgets.isidorus; + +import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.user.client.Window; + +public class IsidorusEntryPoint implements EntryPoint { + + @Override + public void onModuleLoad() { + try{ + String requestedTopicType = IsidorusConstants.HASH_OBJECT_PSI; + if(Window.Location.getHref().contains("environment")) requestedTopicType = IsidorusConstants.ENVIRONMENT_PSI; + + GdlWebPage page = new GdlWebPage(requestedTopicType); + page.createWebPage(); + }catch(Exception e){ + Window.alert("could not create a web page, because: (" + e.getClass() + ") " + e.getMessage()); + } + } + +}

1 0

[isidorus-cvs] r924 - in branches/gdl-frontend/src/anaToMia/hosted_files: . gdl_widgets
by lgiessmann＠common-lisp.net 19 Sep '11

19 Sep '11

Author: lgiessmann Date: Mon Sep 19 03:20:11 2011 New Revision: 924 Log: Deleted: branches/gdl-frontend/src/anaToMia/hosted_files/GDL_Widgets.css branches/gdl-frontend/src/anaToMia/hosted_files/GDL_Widgets.html branches/gdl-frontend/src/anaToMia/hosted_files/gdl_widgets/

1 0

[isidorus-cvs] r923 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus
by lgiessmann＠common-lisp.net 19 Sep '11

19 Sep '11

Author: lgiessmann Date: Mon Sep 19 03:15:12 2011 New Revision: 923 Log: gdl-frontend: Widgets: removed the url-contants for the textgrid-label, since it is coded directly in the host file Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Mon Sep 19 03:11:58 2011 (r922) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Mon Sep 19 03:15:12 2011 (r923) @@ -19,6 +19,4 @@ //public final static String GET_HASH_OBJECT_PSIS_URL = GWT.getModuleBaseURL() + "HashObjectPsis.json"; public final static String GET_ENVIRONMENT_PSIS_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/tm-sparql"; //public final static String GET_ENVIRONMENT_PSIS_URL = GWT.getModuleBaseURL() + "EnvironmentPsis.json"; - public final static String TEXTGRID_LOGO_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "textgrid_small.png"; - //public final static String TEXTGRID_LOGO_URL = GWT.getModuleBaseURL() + "textgrid_small.png"; }

1 0

[isidorus-cvs] r922 - branches/gdl-frontend/src/rest_interface
by lgiessmann＠common-lisp.net 19 Sep '11

19 Sep '11

Author: lgiessmann Date: Mon Sep 19 03:11:58 2011 New Revision: 922 Log: Modified: branches/gdl-frontend/src/rest_interface/set-up-gdl-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 19 02:28:50 2011 (r921) +++ branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Mon Sep 19 03:11:58 2011 (r922) @@ -17,7 +17,7 @@ (defparameter *gdl-base-path* "anaToMia/hosted_files/") (defparameter *gdl-host-file* (concat *gdl-base-path* "GDL_Widgets.html")) (defparameter *gdl-tm-id* "http://textgrid.org/serviceregistry/gdl-frontend/gdl-tm") -(defparameter *gdl-sparql* "/gdl/tm-sparql/?$") +(defparameter *gdl-sparql* "/gdl/sparql/?$") (defun set-up-gdl-interface (&key (get-fragment *gdl-get-fragment*) @@ -61,7 +61,7 @@ hunchentoot:*dispatch-table*) (push - (create-regex-dispatcher gdl-sparql #'gdl-tm-sparql) + (create-regex-dispatcher gdl-sparql #'gdl-sparql-handler) hunchentoot:*dispatch-table*)) @@ -221,7 +221,7 @@ (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+)))) -(defun gdl-tm-sparql (&optional param) +(defun gdl-sparql-handler(&optional param) "Returns a JSON object representing a SPARQL response." (declare (Ignorable param)) (if (eql (hunchentoot:request-method*) :POST)

1 0

[isidorus-cvs] r921 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus
by lgiessmann＠common-lisp.net 19 Sep '11

19 Sep '11

Author: lgiessmann Date: Mon Sep 19 02:28:50 2011 New Revision: 921 Log: gdl-frontend: Widgets: changed the actual request for getting all psis of environment instances; changed the isidorus-url-constants Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java Mon Sep 19 02:18:12 2011 (r920) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/GdlWebPage.java Mon Sep 19 02:28:50 2011 (r921) @@ -89,13 +89,28 @@ private void requestPsis() throws ExecutionException { String url = null; - if(IsidorusConstants.HASH_OBJECT_PSI.equals(GdlWebPage.this.topicTypePsi)) url = URL.encode(IsidorusConstants.GET_HASH_OBJECT_PSIS_URL); - else if(IsidorusConstants.ENVIRONMENT_PSI.equals(GdlWebPage.this.topicTypePsi)) url = URL.encode(IsidorusConstants.GET_ENVIRONMENT_PSIS_URL); - else throw new ExecutionException("the topic type PSI " + GdlWebPage.this.topicTypePsi + " is not supported!"); - RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, url); + String postData = null; + if(IsidorusConstants.HASH_OBJECT_PSI.equals(GdlWebPage.this.topicTypePsi)){ + url = URL.encode(IsidorusConstants.GET_HASH_OBJECT_PSIS_URL); + postData = "PREFIX pref:<http://textgrid.org/serviceregistry/model/types>\n" + + "SELECT ?topics WHERE {\n" + + "?topics a pref:Hash-Object.\n" + + "}"; + } + else if(IsidorusConstants.ENVIRONMENT_PSI.equals(GdlWebPage.this.topicTypePsi)){ + url = URL.encode(IsidorusConstants.GET_ENVIRONMENT_PSIS_URL); + postData = "PREFIX pref:<http://textgrid.org/serviceregistry/model/types>\n" + + "SELECT ?topics WHERE {\n" + + "?topics a pref:Environment.\n" + + "}"; + } + else{ + throw new ExecutionException("the topic type PSI " + GdlWebPage.this.topicTypePsi + " is not supported!"); + } + RequestBuilder builder = new RequestBuilder(RequestBuilder.POST, url); try{ - builder.sendRequest(null, new PsiRequest()); + builder.sendRequest(postData, new PsiRequest()); }catch(RequestException e){ e.printStackTrace(); Window.alert("could not request existing instances of " + GdlWebPage.this.topicTypePsi + ", because(" + e.getClass() + "): " + e.getMessage()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Mon Sep 19 02:18:12 2011 (r920) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/IsidorusConstants.java Mon Sep 19 02:28:50 2011 (r921) @@ -1,8 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.isidorus; - -import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Window; @@ -15,9 +13,12 @@ public final static String DELETE_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/delete"; public final static String COMMIT_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/commit"; public final static String GET_FRAGMENT_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/fragment/"; - //public final static String GET_SCHEMA_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/schema"; - public final static String GET_SCHEMA_REQUEST_URL = GWT.getModuleBaseURL() + "TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm"; - public final static String GET_HASH_OBJECT_PSIS_URL = GWT.getModuleBaseURL() + "HashObjectPsis.json"; - public final static String GET_ENVIRONMENT_PSIS_URL = GWT.getModuleBaseURL() + "EnvironmentPsis.json"; - public final static String TEXTGRID_LOGO_URL = GWT.getModuleBaseURL() + "textgrid_small.png"; + public final static String GET_SCHEMA_REQUEST_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/schema"; + //public final static String GET_SCHEMA_REQUEST_URL = GWT.getModuleBaseURL() + "TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm"; + public final static String GET_HASH_OBJECT_PSIS_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/tm-sparql"; + //public final static String GET_HASH_OBJECT_PSIS_URL = GWT.getModuleBaseURL() + "HashObjectPsis.json"; + public final static String GET_ENVIRONMENT_PSIS_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "/gdl/tm-sparql"; + //public final static String GET_ENVIRONMENT_PSIS_URL = GWT.getModuleBaseURL() + "EnvironmentPsis.json"; + public final static String TEXTGRID_LOGO_URL = Window.Location.getProtocol() + "//" + Window.Location.getHost() + "textgrid_small.png"; + //public final static String TEXTGRID_LOGO_URL = GWT.getModuleBaseURL() + "textgrid_small.png"; }

1 0

[isidorus-cvs] r920 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets: src/us/isidor/gdl/anaToMia/Widgets/isidorus war war/gdl_widgets
by lgiessmann＠common-lisp.net 19 Sep '11

19 Sep '11

1 0

[isidorus-cvs] r919 - branches/gdl-frontend/src/TM-SPARQL
by lgiessmann＠common-lisp.net 19 Sep '11

19 Sep '11

Author: lgiessmann Date: Mon Sep 19 01:56:58 2011 New Revision: 919 Log: tm-sparql: fixed a bug when handling carriage returns of http in the rest-handler Modified: branches/gdl-frontend/src/TM-SPARQL/sparql_parser.lisp Modified: branches/gdl-frontend/src/TM-SPARQL/sparql_parser.lisp ============================================================================== --- branches/gdl-frontend/src/TM-SPARQL/sparql_parser.lisp Mon Sep 19 01:06:33 2011 (r918) +++ branches/gdl-frontend/src/TM-SPARQL/sparql_parser.lisp Mon Sep 19 01:56:58 2011 (r919) @@ -427,7 +427,7 @@ (progn (add-variable construct "*") (parse-variables construct (string-after trimmed-str "*"))) (let ((result (parse-variable-name construct trimmed-str))) - (add-variable construct (getf result :value)) + (add-variable construct (trim-whitespace-right (getf result :value))) (parse-variables construct (getf result :next-query))))))))

1 0

[isidorus-cvs] r918 - branches/gdl-frontend/src/rest_interface
by lgiessmann＠common-lisp.net 19 Sep '11

19 Sep '11

Author: lgiessmann Date: Mon Sep 19 01:06:33 2011 New Revision: 918 Log: gdl-backend: added the tm-sparql interface to the gdl-interface Modified: branches/gdl-frontend/src/rest_interface/rest-interface.lisp branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Modified: branches/gdl-frontend/src/rest_interface/rest-interface.lisp ============================================================================== --- branches/gdl-frontend/src/rest_interface/rest-interface.lisp Mon Sep 19 00:29:32 2011 (r917) +++ branches/gdl-frontend/src/rest_interface/rest-interface.lisp Mon Sep 19 01:06:33 2011 (r918) @@ -59,7 +59,8 @@ :*gdl-host-address* :*gdl-base-path* :*gdl-host-file* - :*gdl-tm-id*)) + :*gdl-tm-id* + :*gdl-sparql*)) (in-package :rest-interface) 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 19 00:29:32 2011 (r917) +++ branches/gdl-frontend/src/rest_interface/set-up-gdl-interface.lisp Mon Sep 19 01:06:33 2011 (r918) @@ -17,12 +17,14 @@ (defparameter *gdl-base-path* "anaToMia/hosted_files/") (defparameter *gdl-host-file* (concat *gdl-base-path* "GDL_Widgets.html")) (defparameter *gdl-tm-id* "http://textgrid.org/serviceregistry/gdl-frontend/gdl-tm") +(defparameter *gdl-sparql* "/gdl/tm-sparql/?$") (defun set-up-gdl-interface (&key (get-fragment *gdl-get-fragment*) (get-schema *gdl-get-schema*) (commit-fragment *gdl-commit-fragment*) (delete-fragment *gdl-delete-fragment*) + (gdl-sparql *gdl-sparql*) (base-path *gdl-base-path*) (host-address *gdl-host-address*) (host-file *gdl-host-file*)) @@ -56,6 +58,10 @@ (push (create-regex-dispatcher delete-fragment #'delete-handler) + hunchentoot:*dispatch-table*) + + (push + (create-regex-dispatcher gdl-sparql #'gdl-tm-sparql) hunchentoot:*dispatch-table*)) @@ -212,4 +218,19 @@ (setf (hunchentoot:return-code*) hunchentoot:+http-not-found+) (setf (hunchentoot:content-type*) "text") (format nil "Topic \"~a\" not found" psi))))) - (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+)))) \ No newline at end of file + (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+)))) + + +(defun gdl-tm-sparql (&optional param) + "Returns a JSON object representing a SPARQL response." + (declare (Ignorable param)) + (if (eql (hunchentoot:request-method*) :POST) + (let ((external-format (flexi-streams:make-external-format + :UTF-8 :eol-style :LF))) + (let ((sparql-request (hunchentoot:raw-post-data + :external-format external-format + :force-text t))) + (export-construct-as-isidorus-json-string + (make-instance 'SPARQL-Query :query sparql-request + :revision 0)))) + (setf (hunchentoot:return-code*) hunchentoot:+http-bad-request+))) \ No newline at end of file

1 0