X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Rakka.git;a=blobdiff_plain;f=Rakka%2FResource%2FPageEntity.hs;h=690695e881bc73c58c6a4c1b127064112fb1e81a;hp=a9eff98ac6c1890741ca546d7e0028c935f157c5;hb=fcddebcc3cc02ae8d1904b9338334d538019e74a;hpb=01a4a132192ed8b65c8aa7b86cb0e9bc08b725ff diff --git a/Rakka/Resource/PageEntity.hs b/Rakka/Resource/PageEntity.hs index a9eff98..690695e 100644 --- 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 ()