X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FPage.hs;h=4dd5fcf246300e5e0172fe7db987c7156b8e4fac;hb=cddd833c65cdd8092588bd3bdfe2b9153848302f;hp=a9dbe4ff2967c9b83909b8d831fbfcfeba57fd50;hpb=df6079ca32f808d76c595e7953bff7a1dd46b10b;p=Rakka.git diff --git a/Rakka/Page.hs b/Rakka/Page.hs index a9dbe4f..4dd5fcf 100644 --- a/Rakka/Page.hs +++ b/Rakka/Page.hs @@ -12,7 +12,6 @@ module Rakka.Page , pageUpdateInfo , pageRevision - , isSafeChar , encodePageName , decodePageName @@ -30,9 +29,6 @@ module Rakka.Page where import qualified Codec.Binary.UTF8.String as UTF8 -import Control.Arrow -import Control.Arrow.ArrowIO -import Control.Arrow.ArrowList import qualified Data.ByteString.Lazy as Lazy (ByteString) import qualified Data.ByteString.Lazy as L hiding (ByteString) import qualified Data.ByteString.Lazy.Char8 as L8 hiding (ByteString) @@ -48,8 +44,7 @@ import Rakka.Utils import Rakka.W3CDateTime import Subversion.Types import System.FilePath.Posix -import Text.XML.HXT.Arrow.XmlArrow -import Text.XML.HXT.Arrow.XmlNodeSet +import Text.XML.HXT.Arrow import Text.XML.HXT.DOM.TypeDefs @@ -133,14 +128,6 @@ encodePageName = escapeURIString isSafeChar . UTF8.encodeString . fixPageName fixPageName = (\ (x:xs) -> toUpper x : xs) . map (\ c -> if c == ' ' then '_' else c) -isSafeChar :: Char -> Bool -isSafeChar c - | c == '/' = True - | isReserved c = False - | c > ' ' && c <= '~' = True - | otherwise = False - - -- URI unescape して UTF-8 から decode する。 decodePageName :: FilePath -> PageName decodePageName = UTF8.decodeString . unEscapeString @@ -402,4 +389,4 @@ parseUpdateInfo , uiOldName = oldName } - \ No newline at end of file +