Record to save changes

[Rakka.git] / Rakka / Page.hs

diff --git a/Rakka/Page.hs b/Rakka/Page.hs
index 29f0964541d4228ea4c2a6b7e14a7f445c4e4a6e..ff1c0ac8a0140fab0cc77c599b556a3ccc73ef80 100644 (file)
--- a/Rakka/Page.hs
+++ b/Rakka/Page.hs
@@ -1,12 +1,16 @@
 module Rakka.Page
     ( PageName
     , Page(..)
+    , LanguageTag
+    , LanguageName
+
     , encodePageName
     , decodePageName
     , mkPageURI
     , mkPageFragmentURI
     , mkObjectURI
     , mkAuxiliaryURI
+    , mkRakkaURI
     )
     where
 
@@ -14,6 +18,7 @@ import           Data.ByteString.Base (LazyByteString)
 import qualified Data.ByteString.Char8 as C8
 import           Data.Encoding
 import           Data.Encoding.UTF8
+import           Data.Map (Map)
 import           Network.HTTP.Lucu
 import           Network.URI
 import           Subversion.Types
@@ -23,6 +28,9 @@ import           System.Time
 
 type PageName = String
 
+type LanguageTag  = String -- See RFC 3066: http://www.ietf.org/rfc/rfc3066.txt
+type LanguageName = String -- i.e. "日本語"
+
 
 data Page
     = Redirection {
@@ -34,15 +42,16 @@ data Page
     | Entity {
         pageName      :: !PageName
       , pageType      :: !MIMEType
+      , pageLanguage  :: !(Maybe LanguageTag)
       , pageIsTheme   :: !Bool     -- text/css 以外では無意味
       , pageIsFeed    :: !Bool     -- text/x-rakka 以外では無意味
       , pageIsLocked  :: !Bool
       , pageIsBoring  :: !Bool
       , pageIsBinary  :: !Bool
-      , pageRevision  :: !(Maybe RevNum)
+      , pageRevision  :: !RevNum
       , pageLastMod   :: !CalendarTime
       , pageSummary   :: !(Maybe String)
-      , pageOtherLang :: ![(String, PageName)]
+      , pageOtherLang :: !(Map LanguageTag PageName)
       , pageContent   :: !LazyByteString
       }
 
@@ -53,6 +62,8 @@ encodePageName = escapeURIString isSafe . C8.unpack . encode UTF8
     where
       isSafe :: Char -> Bool
       isSafe c
+          | c == '/'             = True
+          | isReserved c         = False
           | c >= ' ' && c <= '~' = True
           | otherwise            = False
 
@@ -87,3 +98,13 @@ mkAuxiliaryURI baseURI basePath name
     = baseURI {
         uriPath = foldl combine "/" ([uriPath baseURI] ++ basePath ++ [encodePageName name])
       }
+
+
+mkRakkaURI :: PageName -> URI
+mkRakkaURI name = URI {
+                    uriScheme    = "rakka:"
+                  , uriAuthority = Nothing
+                  , uriPath      = encodePageName name
+                  , uriQuery     = ""
+                  , uriFragment  = ""
+                  }