X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=Network%2FHTTP%2FLucu%2FDefaultPage.hs;h=e1bdf1ce6e3daeb34af5e7f3b07ccf955364265d;hb=ca338174155913a969808d7b20193973394e474e;hp=c315424414857aba8b5ffe0d1047dac10c0db5bb;hpb=0ff03469c29b791f2c609a659bbf59be97e306f2;p=Lucu.git

diff --git a/Network/HTTP/Lucu/DefaultPage.hs b/Network/HTTP/Lucu/DefaultPage.hs
index c315424..e1bdf1c 100644
--- a/Network/HTTP/Lucu/DefaultPage.hs
+++ b/Network/HTTP/Lucu/DefaultPage.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE
-    BangPatterns
-  , OverloadedStrings
+    OverloadedStrings
+  , RecordWildCards
   , UnboxedTuples
   , UnicodeSyntax
   #-}
@@ -10,7 +10,7 @@ module Network.HTTP.Lucu.DefaultPage
     , mkDefaultPage
     )
     where
-import qualified Blaze.ByteString.Builder.ByteString as BB
+import qualified Blaze.ByteString.Builder.Char.Utf8 as BB
 import Control.Arrow
 import Control.Arrow.ArrowList
 import Control.Arrow.ListArrow
@@ -21,7 +21,6 @@ import qualified Data.Ascii as A
 import Data.Maybe
 import qualified Data.Text as T
 import qualified Data.Text.Lazy as Lazy
-import qualified Data.Text.Lazy.Encoding as Lazy
 import Network.HTTP.Lucu.Config
 import Network.HTTP.Lucu.Headers
 import Network.HTTP.Lucu.Interaction
@@ -36,7 +35,7 @@ import Text.XML.HXT.DOM.TypeDefs
 
 getDefaultPage ∷ Config → Maybe Request → Response → Lazy.Text
 {-# INLINEABLE getDefaultPage #-}
-getDefaultPage !conf !req !res
+getDefaultPage conf req res
     = let msgA     = getMsg req res
           [xmlStr] = runLA ( mkDefaultPage conf (resStatus res) msgA
                              ⋙ 
@@ -46,21 +45,16 @@ getDefaultPage !conf !req !res
         Lazy.pack xmlStr
 
 writeDefaultPage ∷ Interaction → STM ()
-writeDefaultPage !itr
+writeDefaultPage (Interaction {..})
     -- Content-Type が正しくなければ補完できない。
-    = do res ← readItr itrResponse id itr
-         when (getHeader "Content-Type" res == Just defaultPageContentType)
-                  $ do reqM ← readItr itrRequest id itr
-
-                       let conf = itrConfig itr
-                           page = getDefaultPage conf reqM res
-
-                       putTMVar (itrBodyToSend itr)
-                                (BB.fromLazyByteString $ Lazy.encodeUtf8 page)
+    = do res ← readTVar itrResponse
+         when (getHeader "Content-Type" res ≡ Just defaultPageContentType)
+             $ do let page = getDefaultPage itrConfig itrRequest res
+                  putTMVar itrBodyToSend (BB.fromLazyText page)
 
 mkDefaultPage ∷ (ArrowXml a) ⇒ Config → StatusCode → a b XmlTree → a b XmlTree
 {-# INLINEABLE mkDefaultPage #-}
-mkDefaultPage !conf !status !msgA
+mkDefaultPage conf status msgA
     = let sStr = A.toString $ A.fromAsciiBuilder $ printStatusCode status
           sig  = concat [ A.toString (cnfServerSoftware conf)
                         , " at "
@@ -83,7 +77,7 @@ mkDefaultPage !conf !status !msgA
 
 getMsg ∷ (ArrowXml a) ⇒ Maybe Request → Response → a b XmlTree
 {-# INLINEABLE getMsg #-}
-getMsg !req !res
+getMsg req res
     = case resStatus res of
         -- 1xx は body を持たない
         -- 2xx の body は補完しない