Fixing build breakage...

[Rakka.git] / Rakka / Resource / Render.hs

diff --git a/Rakka/Resource/Render.hs b/Rakka/Resource/Render.hs
index fdb3d87afca2428192ce49aef855f91e81538a84..8202cf626e050d0ada2f8352dbbaa61042dc89fa 100644 (file)
--- a/Rakka/Resource/Render.hs
+++ b/Rakka/Resource/Render.hs
@@ -2,25 +2,21 @@ module Rakka.Resource.Render
     ( resRender
     )
     where
     ( resRender
     )
     where

-
-import qualified Codec.Binary.UTF8.String as UTF8

 import           Control.Arrow
 import           Control.Arrow.ArrowIO
 import           Control.Arrow.ArrowList
 import           Control.Monad.Trans
 import qualified Data.ByteString.Lazy as Lazy
 import           Control.Arrow
 import           Control.Arrow.ArrowIO
 import           Control.Arrow.ArrowList
 import           Control.Monad.Trans
 import qualified Data.ByteString.Lazy as Lazy

-import           Data.Maybe

 import           Network.HTTP.Lucu
 import           Network.HTTP.Lucu

-import           Network.HTTP.Lucu.Utils

 import           OpenSSL.EVP.Base64
 import           Rakka.Environment
 import           Rakka.Page
 import           Rakka.Utils
 import           Rakka.Wiki.Engine
 import           OpenSSL.EVP.Base64
 import           Rakka.Environment
 import           Rakka.Page
 import           Rakka.Utils
 import           Rakka.Wiki.Engine

+import           System.FilePath.Posix

 import           Text.XML.HXT.Arrow.Namespace
 import           Text.XML.HXT.Arrow.WriteDocument
 import           Text.XML.HXT.Arrow.XmlArrow
 import           Text.XML.HXT.Arrow.Namespace
 import           Text.XML.HXT.Arrow.WriteDocument
 import           Text.XML.HXT.Arrow.XmlArrow

-import           Text.XML.HXT.Arrow.XmlIOStateArrow

 import           Text.XML.HXT.DOM.TypeDefs
 import           Text.XML.HXT.DOM.XmlKeywords
 
 import           Text.XML.HXT.DOM.TypeDefs
 import           Text.XML.HXT.DOM.XmlKeywords
 


@@ -38,7 +34,7 @@ resRender env
       }
     where
       toPageName :: [String] -> PageName
       }
     where
       toPageName :: [String] -> PageName

-      toPageName = decodePageName . joinWith "/" 
+      toPageName = UTF8.decodeString . joinPath

 
 
 {-
 
 
 {-


@@ -83,9 +79,11 @@ handleRender env name
                                      >>>
                                      render env
                                      >>>
                                      >>>
                                      render env
                                      >>>

-                                     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

 
 
 render :: (ArrowXml a, ArrowChoice a, ArrowIO a) =>
 
 
 render :: (ArrowXml a, ArrowChoice a, ArrowIO a) =>