merge branch origin/master

[Rakka.git] / Rakka / Storage / Repos.hs

diff --git a/Rakka/Storage/Repos.hs b/Rakka/Storage/Repos.hs
index 6a90ed6e5365aebd1340cf9a80b11c8e7d0d2582..05759d9d4b70324307c1f236d0dc005084db692a 100644 (file)
--- a/Rakka/Storage/Repos.hs
+++ b/Rakka/Storage/Repos.hs
@@ -29,13 +29,13 @@ import           Data.Set (Set)
 import qualified Data.Set as S hiding (Set)
 import qualified Data.Text as T
 import           Data.Time
 import qualified Data.Set as S hiding (Set)
 import qualified Data.Text as T
 import           Data.Time

+import qualified Data.Time.W3C as W3C

 import           Network.HTTP.Lucu hiding (redirect)
 import Prelude.Unicode
 import           Rakka.Attachment
 import           Rakka.Page
 import           Rakka.SystemConfig
 import           Rakka.Utils
 import           Network.HTTP.Lucu hiding (redirect)
 import Prelude.Unicode
 import           Rakka.Attachment
 import           Rakka.Page
 import           Rakka.SystemConfig
 import           Rakka.Utils

-import           Rakka.W3CDateTime

 import           Subversion.FileSystem
 import           Subversion.FileSystem.DirEntry
 import           Subversion.FileSystem.Revision
 import           Subversion.FileSystem
 import           Subversion.FileSystem.DirEntry
 import           Subversion.FileSystem.Revision


@@ -172,7 +172,7 @@ loadPageInRepository repos name rev
                               $ fmap chomp (lookup "svn:mime-type" props)
 
                lastMod <- unsafeIOToFS $
                               $ fmap chomp (lookup "svn:mime-type" props)
 
                lastMod <- unsafeIOToFS $

-                          liftM (fromJust . parseW3CDateTime . chomp . fromJust)
+                          liftM (fromJust . W3C.parse . chomp . fromJust)

                                 (getRevisionProp' fs pageRev "svn:date")
 
                return Entity {
                                 (getRevisionProp' fs pageRev "svn:date")
 
                return Entity {


@@ -206,7 +206,7 @@ loadPageInRepository repos name rev
                    dest    = T.pack ∘ chomp $ decodeString content
 
                lastMod <- unsafeIOToFS $
                    dest    = T.pack ∘ chomp $ decodeString content
 
                lastMod <- unsafeIOToFS $

-                          liftM (fromJust . parseW3CDateTime . chomp . fromJust)
+                          liftM (fromJust . W3C.parse . chomp . fromJust)

                                 (getRevisionProp' fs pageRev "svn:date")
 
                isLocked <- liftM isJust (getNodeProp path "rakka:isLocked")
                                 (getRevisionProp' fs pageRev "svn:date")
 
                isLocked <- liftM isJust (getNodeProp path "rakka:isLocked")