Resurrection from slight bitrot.

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

diff --git a/Rakka/Resource/PageEntity.hs b/Rakka/Resource/PageEntity.hs
index bf7753ffba068984d7573d25260b200d384156e8..690695e881bc73c58c6a4c1b127064112fb1e81a 100644 (file)
--- a/Rakka/Resource/PageEntity.hs
+++ b/Rakka/Resource/PageEntity.hs
@@ -11,7 +11,6 @@ import qualified Data.Map as M
 import           Data.Maybe
 import           Data.Time
 import           Network.HTTP.Lucu
-import           Network.HTTP.Lucu.Utils
 import           Network.URI hiding (path)
 import           Rakka.Environment
 import           Rakka.Page
@@ -21,11 +20,10 @@ import           Rakka.SystemConfig
 import           Rakka.Utils
 import           Rakka.W3CDateTime
 import           Rakka.Wiki.Engine
-import           System.FilePath
+import           System.FilePath.Posix
 import           Text.HyperEstraier hiding (getText)
 import           Text.XML.HXT.Arrow
-import           Text.XML.HXT.DOM.TypeDefs
-import           Text.XML.HXT.DOM.XmlKeywords
+import           Text.XML.HXT.XPath
 
 
 fallbackPageEntity :: Environment -> [String] -> IO (Maybe ResourceDef)
@@ -45,7 +43,7 @@ fallbackPageEntity env path
           }
     where
       toPageName :: [String] -> PageName
-      toPageName = decodePageName . dropExtension . joinWith "/"
+      toPageName = decodePageName . dropExtension . joinPath
 
 
 handleGet :: Environment -> PageName -> Resource ()
@@ -83,9 +81,11 @@ handleRedirect env
                                                                 >>>
                                                                 xmlizePage
                                                                 >>>
-                                                                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
 
                        _   -> do BaseURI baseURI <- getSysConf (envSysConf env)
                                  let uri = mkPageFragmentURI