X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FPage.hs;h=e396c1b32915fa29568e84c2b26a1ae0c2c18a35;hb=88747f2463963ff2895a597b3054b12b2288530e;hp=ab2ae88f3b5dac6f34d22908638eb4de50ec7739;hpb=fcddebcc3cc02ae8d1904b9338334d538019e74a;p=Rakka.git diff --git a/Rakka/Page.hs b/Rakka/Page.hs index ab2ae88..e396c1b 100644 --- a/Rakka/Page.hs +++ b/Rakka/Page.hs @@ -27,8 +27,6 @@ module Rakka.Page , parseXmlizedPage ) where - -import qualified Codec.Binary.UTF8.String as UTF8 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) @@ -36,14 +34,13 @@ import Data.Char import Data.Map (Map) import qualified Data.Map as M import Data.Time +import qualified Data.Time.W3C as W3C import Network.HTTP.Lucu hiding (redirect) import Network.URI hiding (fragment) import OpenSSL.EVP.Base64 import Rakka.Utils -import Rakka.W3CDateTime import Subversion.Types import System.FilePath.Posix -import Text.XML.HXT.Arrow import Text.XML.HXT.XPath @@ -237,7 +234,7 @@ xmlizePage += sattr "redirect" (redirDest page) += sattr "isLocked" (yesOrNo $ redirIsLocked page) += sattr "revision" (show $ redirRevision page) - += sattr "lastModified" (formatW3CDateTime lastMod) + += sattr "lastModified" (W3C.format lastMod) )) -<< () xmlizeEntity :: (ArrowXml a, ArrowChoice a, ArrowIO a) => a Page XmlTree @@ -263,7 +260,7 @@ xmlizePage += sattr "isLocked" (yesOrNo $ entityIsLocked page) += sattr "isBinary" (yesOrNo $ entityIsBinary page) += sattr "revision" (show $ entityRevision page) - += sattr "lastModified" (formatW3CDateTime lastMod) + += sattr "lastModified" (W3C.format lastMod) += ( case entitySummary page of Just s -> eelem "summary" += txt s Nothing -> none