X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FResource%2FSearch.hs;h=eb4acf253d11c4d0535bed1c25082fc350e58fec;hb=88747f2;hp=423bfdc3f32b921393c95892362dbf920f29431d;hpb=fcddebcc3cc02ae8d1904b9338334d538019e74a;p=Rakka.git diff --git a/Rakka/Resource/Search.hs b/Rakka/Resource/Search.hs index 423bfdc..eb4acf2 100644 --- a/Rakka/Resource/Search.hs +++ b/Rakka/Resource/Search.hs @@ -2,14 +2,13 @@ module Rakka.Resource.Search ( resSearch ) where - -import qualified Codec.Binary.UTF8.Generic as UTF8 import Control.Monad.Trans import Data.List import Data.Maybe import Data.Time +import qualified Data.Time.RFC1123 as RFC1123 +import qualified Data.Time.W3C as W3C import Network.HTTP.Lucu -import Network.HTTP.Lucu.RFC1123DateTime import Network.URI hiding (query, fragment) import Rakka.Environment import Rakka.Page @@ -17,11 +16,9 @@ import Rakka.Resource import Rakka.Storage import Rakka.SystemConfig import Rakka.Utils -import Rakka.W3CDateTime import Rakka.Wiki.Engine import System.FilePath import Text.HyperEstraier hiding (getText) -import Text.XML.HXT.Arrow import Text.XML.HXT.XPath @@ -116,7 +113,7 @@ handleSearch env += attr "name" (arr hpPageName >>> mkText) += attr "lastModified" ( arrIO (utcToLocalZonedTime . hpLastMod) >>> - arr formatW3CDateTime + arr W3C.format >>> mkText ) @@ -281,11 +278,11 @@ searchResultToXHTML env += sattr "class" "date" += ( getAttrValue "lastModified" >>> - arr (zonedTimeToUTC . fromJust . parseW3CDateTime) + arr (zonedTimeToUTC . fromJust . W3C.parse) >>> arrIO utcToLocalZonedTime >>> - arr formatRFC1123DateTime + arr RFC1123.format >>> mkText )