Improvements of "gf -server" mode and related setup

"gf -server" mode now contains everything needed to run the minibar and the grammar editor (including example-based grammar writing). The Setup.hs script installs the required files where gf -server can find them. These files have been moved to a new directory: src/www. The separate server program pgf-http is now obsolete.
2011-10-12 17:03:54 +00:00
parent 0aba45560d
commit 44d1a5a9f7
51 changed files with 118 additions and 20 deletions
--- a/src/compiler/GFServer.hs
+++ b/src/compiler/GFServer.hs
@@ -27,21 +27,19 @@ import qualified ExampleService as ES
 import Paths_gf(getDataDir)
 import RunHTTP(Options(..),cgiHandler)

-- * Configuraiton
-
-options = Options { documentRoot = "." {-datadir</>"www"-}, port = gfport }
-gfport = 41296
-
 -- * HTTP server
 server execute1 state0 = 
  do state <- newMVar M.empty
     cache <- PS.newPGFCache
-     --datadir <- getDataDir
-     putStrLn $ "Starting server on port "++show gfport
-     initServer gfport (modifyMVar state . handle state0 cache execute1)
+     datadir <- getDataDir
+     let options = Options { documentRoot = datadir</>"www", port = 41296 }
+     putStrLn $ "Starting HTTP server, open http://localhost:"
+                ++show (port options)++"/ in your web browser."
+     initServer (port options)
+                (modifyMVar state . handle options state0 cache execute1)

 -- * HTTP request handler
-handle state0 cache execute1
+handle options state0 cache execute1
       rq@(Request method URI{uriPath=upath,uriQuery=q} hdrs body) state =
    do let qs = decodeQ $ 
                case method of
@@ -67,6 +65,8 @@ handle state0 cache execute1
  where
    root = documentRoot options

+    translatePath rpath = root</>rpath -- hmm, check for ".."
+
    wrapCGI cgi = 
      do resp <- cgiHandler root (handleErrors . handleCGIErrors $ cgi) rq
         return (state,resp)
@@ -191,8 +191,6 @@ escape1 c   = [c]

 -- * Static content

-translatePath path = documentRoot options</>path -- hmm, check for ".."
-
 serveStaticFile path =
  do b <- doesDirectoryExist path
     let path' = if b then path </> "index.html" else path
--- a/src/editor/simple/Makefile
+++ b/src/editor/simple/Makefile
--- a/src/editor/simple/P/1306856253_weather_06.png
+++ b/src/editor/simple/P/1306856253_weather_06.png
--- a/src/editor/simple/P/1307545089_weather_04.png
+++ b/src/editor/simple/P/1307545089_weather_04.png
--- a/src/editor/simple/P/w1s.jpg
+++ b/src/editor/simple/P/w1s.jpg
--- a/src/editor/simple/P/w2s.jpg
+++ b/src/editor/simple/P/w2s.jpg
--- a/src/editor/simple/P/w3s.jpg
+++ b/src/editor/simple/P/w3s.jpg
--- a/src/editor/simple/P/w4s.jpg
+++ b/src/editor/simple/P/w4s.jpg
--- a/src/editor/simple/TODO
+++ b/src/editor/simple/TODO
--- a/src/editor/simple/about.html
+++ b/src/editor/simple/about.html
--- a/src/editor/simple/cloud.js
+++ b/src/editor/simple/cloud.js
--- a/src/editor/simple/cloud2.js
+++ b/src/editor/simple/cloud2.js
--- a/src/editor/simple/editor.css
+++ b/src/editor/simple/editor.css
--- a/src/editor/simple/editor.js
+++ b/src/editor/simple/editor.js
--- a/src/editor/simple/example_based.js
+++ b/src/editor/simple/example_based.js
--- a/src/editor/simple/gf_abs.js
+++ b/src/editor/simple/gf_abs.js
--- a/src/editor/simple/gfse.manifest
+++ b/src/editor/simple/gfse.manifest
--- a/src/editor/simple/grammars.cgi
+++ b/src/editor/simple/grammars.cgi
--- a/src/editor/simple/index.html
+++ b/src/editor/simple/index.html
@@ -32,7 +32,7 @@ This page does not work without JavaScript.
 <hr>
 <div class=modtime><small>
 HTML
-<!-- hhmts start --> Last modified: Mon Oct 10 17:54:37 CEST 2011 <!-- hhmts end -->
+<!-- hhmts start --> Last modified: Mon Oct 10 19:24:05 CEST 2011 <!-- hhmts end -->
 </small></div>
 <a href="about.html">About</a>
 <pre id=debug></pre>
@@ -42,7 +42,7 @@ HTML
 <script type="text/javascript" src="gf_abs.js"></script>
 <script type="text/javascript" src="example_based.js"></script>
 <script type="text/javascript" src="editor.js"></script>
-<script type="text/javascript" src="cloud.js"></script>
+<script type="text/javascript" src="cloud2.js"></script>
 <script type="text/javascript" src="sort.js"></script>
 </body>
 </html>
--- a/src/editor/simple/localstorage.js
+++ b/src/editor/simple/localstorage.js
--- a/src/editor/simple/molto.css
+++ b/src/editor/simple/molto.css
--- a/src/editor/simple/save.hs
+++ b/src/editor/simple/save.hs
--- a/src/editor/simple/share.html
+++ b/src/editor/simple/share.html
@@ -13,12 +13,12 @@

 <hr>
 <address></address>
-<!-- hhmts start --> Last modified: Mon Aug  1 16:24:44 CEST 2011 <!-- hhmts end -->
+<!-- hhmts start --> Last modified: Mon Oct 10 20:29:01 CEST 2011 <!-- hhmts end -->
 <script type="text/javascript" src="support.js"></script>
 <script type="text/javascript" src="localstorage.js"></script>
 <script type="text/javascript" src="gf_abs.js"></script>
 <script type="text/javascript" src="editor.js"></script>
-<script type="text/javascript" src="cloud.js"></script>
+<script type="text/javascript" src="cloud2.js"></script>
 <script type="text/javascript" src="sort.js"></script>
 <script type="text/javascript">
 download_from_cloud();
--- a/src/editor/simple/slideshow.js
+++ b/src/editor/simple/slideshow.js
--- a/src/editor/simple/upload.cgi
+++ b/src/editor/simple/upload.cgi
--- a/src/www/index.html
+++ b/src/www/index.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+
+<!-- This is the start page served by "gf -server" -->
+
+<title>GF web service</title>
+<h1>GF web service</h1>
+
+<h2>Available web services</h2>
+
+<ul>
+  <li><a href="minibar/minibar.html">Minibar</a>
+  <li><a href="gfse/">GF online editor for simple multilingual grammars</a>
+</ul>
+
+
+<hr>
+
+<a href="http://www.grammaticalframework.org/">Grammatical Framework</a>
--- a/src/runtime/javascript/minibar/about.html
+++ b/src/runtime/javascript/minibar/about.html
--- a/src/runtime/javascript/minibar/align-btn.png
+++ b/src/runtime/javascript/minibar/align-btn.png
--- a/src/runtime/javascript/minibar/brushed-metal.png
+++ b/src/runtime/javascript/minibar/brushed-metal.png
--- a/src/runtime/javascript/minibar/example.html
+++ b/src/runtime/javascript/minibar/example.html
--- a/src/runtime/javascript/minibar/feedback.cgi
+++ b/src/runtime/javascript/minibar/feedback.cgi
--- a/src/runtime/javascript/minibar/feedback.html
+++ b/src/runtime/javascript/minibar/feedback.html
--- a/src/runtime/javascript/minibar/gf-web-api-examples.html
+++ b/src/runtime/javascript/minibar/gf-web-api-examples.html
--- a/src/runtime/javascript/minibar/minibar-api.html
+++ b/src/runtime/javascript/minibar/minibar-api.html
--- a/src/runtime/javascript/minibar/minibar.css
+++ b/src/runtime/javascript/minibar/minibar.css
--- a/src/runtime/javascript/minibar/minibar.html
+++ b/src/runtime/javascript/minibar/minibar.html
--- a/src/runtime/javascript/minibar/minibar.js
+++ b/src/runtime/javascript/minibar/minibar.js
--- a/src/runtime/javascript/minibar/minibar_input.js
+++ b/src/runtime/javascript/minibar/minibar_input.js
--- a/src/runtime/javascript/minibar/minibar_online.js
+++ b/src/runtime/javascript/minibar/minibar_online.js
--- a/src/runtime/javascript/minibar/minibar_support.js
+++ b/src/runtime/javascript/minibar/minibar_support.js
--- a/src/runtime/javascript/minibar/minibar_translations.js
+++ b/src/runtime/javascript/minibar/minibar_translations.js
--- a/src/runtime/javascript/minibar/pgf_offline.js
+++ b/src/runtime/javascript/minibar/pgf_offline.js
--- a/src/runtime/javascript/minibar/pgf_online.js
+++ b/src/runtime/javascript/minibar/pgf_online.js
--- a/src/runtime/javascript/minibar/phrasebook.html
+++ b/src/runtime/javascript/minibar/phrasebook.html
--- a/src/runtime/javascript/minibar/saldotest.html
+++ b/src/runtime/javascript/minibar/saldotest.html
--- a/src/runtime/javascript/minibar/saldotest.js
+++ b/src/runtime/javascript/minibar/saldotest.js
--- a/src/runtime/javascript/minibar/support.js
+++ b/src/runtime/javascript/minibar/support.js
--- a/src/runtime/javascript/minibar/tree-btn.png
+++ b/src/runtime/javascript/minibar/tree-btn.png