Bugfix regarding with URI escaping

[Rakka.git] / Rakka / Page.hs

diff --git a/Rakka/Page.hs b/Rakka/Page.hs
index a9dbe4ff2967c9b83909b8d831fbfcfeba57fd50..ab2ae88f3b5dac6f34d22908638eb4de50ec7739 100644 (file)
--- a/Rakka/Page.hs
+++ b/Rakka/Page.hs
@@ -12,7 +12,6 @@ module Rakka.Page
     , pageUpdateInfo
     , pageRevision
 
-    , isSafeChar
     , encodePageName
     , decodePageName
 
@@ -30,16 +29,12 @@ 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)
 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)
@@ -48,9 +43,8 @@ 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.DOM.TypeDefs
+import           Text.XML.HXT.Arrow
+import           Text.XML.HXT.XPath
 
 
 type PageName = String
@@ -133,15 +127,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 +387,4 @@ parseUpdateInfo
                       , uiOldName     = oldName
                       }
 
-      
\ No newline at end of file
+