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

[lgiessmann at common-lisp.net]

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)))