From f2751ff9e11bd7ec4b1f489913191e34f0bd78e3 Mon Sep 17 00:00:00 2001
From: hallgren <hallgren@chalmers.se>
Date: Wed, 9 Jan 2013 16:44:18 +0000
Subject: Fixes for minibar offline

Tested it in Firefox 18 (which has the new Ionmonkey JavaScript engine).
Still get stack overflows.
---
 src/server/PGFService.hs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/server')

diff --git a/src/server/PGFService.hs b/src/server/PGFService.hs
index ee83394da..71c4f37d3 100644
--- a/src/server/PGFService.hs
+++ b/src/server/PGFService.hs
@@ -48,15 +48,15 @@ cgiMain cache = handleErrors . handleCGIErrors $
 
 cgiMain' :: Cache PGF -> FilePath -> CGI CGIResult
 cgiMain' cache path =
-    do pgf <- liftIO $ readCache cache path
-       command <- liftM (maybe "grammar" (urlDecodeUnicode . UTF8.decodeString))
+    do command <- liftM (maybe "grammar" (urlDecodeUnicode . UTF8.decodeString))
                         (getInput "command")
-       pgfMain path pgf command
+       case command of
+         "download" -> outputBinary    =<< liftIO (BS.readFile path)
+         _          -> pgfMain command =<< liftIO (readCache cache path)
 
-pgfMain :: FilePath -> PGF -> String -> CGI CGIResult
-pgfMain path pgf command =
+pgfMain :: String -> PGF -> CGI CGIResult
+pgfMain command pgf =
     case command of
-      "download"       -> outputBinary =<< liftIO (BS.readFile path)
       "parse"          -> outputJSONP =<< doParse pgf `fmap` getText `ap` getCat `ap` getFrom `ap` getLimit
       "complete"       -> outputJSONP =<< doComplete pgf `fmap` getText `ap` getCat `ap` getFrom `ap` getLimit
       "linearize"      -> outputJSONP =<< doLinearize pgf `fmap` getTree `ap` getTo
-- 
cgit v1.2.3