Fixing build breakage...

[Rakka.git] / Rakka / Resource.hs

diff --git a/Rakka/Resource.hs b/Rakka/Resource.hs
index 0333d6f53068d9daff76eadb5eb4fa56d0e105f5..a1c4d90af52b3847b7896ae5904a5690d04e09fe 100644 (file)
--- a/Rakka/Resource.hs
+++ b/Rakka/Resource.hs
@@ -9,8 +9,6 @@ module Rakka.Resource
     , getUserID
     )
     where
-
-import qualified Codec.Binary.UTF8.String as UTF8
 import           Control.Arrow
 import           Control.Arrow.ArrowList
 import           Control.Monad
@@ -25,7 +23,6 @@ import           System.FilePath.Posix
 import           System.Log.Logger
 import           Text.XML.HXT.Arrow.ReadDocument
 import           Text.XML.HXT.Arrow.WriteDocument
-import           Text.XML.HXT.Arrow.XmlIOStateArrow
 import           Text.XML.HXT.DOM.TypeDefs
 import           Text.XML.HXT.DOM.XmlKeywords
 
@@ -162,9 +159,11 @@ outputXmlPage tree formatters
                                         >>>
                                         formatter
                                         >>>
-                                        writeDocumentToString [ (a_indent, v_1) ]
+                                        writeDocumentToString [ (a_indent         , v_1 )
+                                                              , (a_output_encoding, utf8)
+                                                              , (a_no_xml_pi      , v_0 ) ]
                                       )
-         output $ UTF8.encodeString resultStr
+         output resultStr
 
 
 outputXmlPage' :: XmlTree -> IOSArrow XmlTree XmlTree -> Resource ()
@@ -179,9 +178,11 @@ outputXml tree
                                     >>>
                                     constA tree
                                     >>>
-                                    writeDocumentToString [ (a_indent, v_1) ]
+                                    writeDocumentToString [ (a_indent         , v_1 )
+                                                           , (a_output_encoding, utf8)
+                                                           , (a_no_xml_pi      , v_0 ) ]
                                   )
-        output $ UTF8.encodeString xmlStr
+        output xmlStr
 
 
 getUserID :: Environment -> Resource (Maybe String)