X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FPage.hs;h=ab2ae88f3b5dac6f34d22908638eb4de50ec7739;hb=fcddebcc3cc02ae8d1904b9338334d538019e74a;hp=4dd5fcf246300e5e0172fe7db987c7156b8e4fac;hpb=01a4a132192ed8b65c8aa7b86cb0e9bc08b725ff;p=Rakka.git diff --git a/Rakka/Page.hs b/Rakka/Page.hs index 4dd5fcf..ab2ae88 100644 --- a/Rakka/Page.hs +++ b/Rakka/Page.hs @@ -35,7 +35,6 @@ import qualified Data.ByteString.Lazy.Char8 as L8 hiding (ByteString) import Data.Char import Data.Map (Map) import qualified Data.Map as M -import Data.Maybe import Data.Time import Network.HTTP.Lucu hiding (redirect) import Network.URI hiding (fragment) @@ -45,7 +44,7 @@ import Rakka.W3CDateTime import Subversion.Types import System.FilePath.Posix import Text.XML.HXT.Arrow -import Text.XML.HXT.DOM.TypeDefs +import Text.XML.HXT.XPath type PageName = String @@ -128,7 +127,6 @@ encodePageName = escapeURIString isSafeChar . UTF8.encodeString . fixPageName fixPageName = (\ (x:xs) -> toUpper x : xs) . map (\ c -> if c == ' ' then '_' else c) --- URI unescape して UTF-8 から decode する。 decodePageName :: FilePath -> PageName decodePageName = UTF8.decodeString . unEscapeString