X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FResource%2FSearch.hs;h=eb4acf253d11c4d0535bed1c25082fc350e58fec;hb=88747f2;hp=3f5a869c4def3d64d3e5de0fdd0ae18df1b3754c;hpb=706ee842873fdceb9465cdf6a583176ab855fae2;p=Rakka.git

diff --git a/Rakka/Resource/Search.hs b/Rakka/Resource/Search.hs
index 3f5a869..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,12 +16,10 @@ 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.DOM.TypeDefs
+import           Text.XML.HXT.XPath
 
 
 resSearch :: Environment -> ResourceDef
@@ -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
                       )