X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FStorage%2FImpl.hs;h=e699163b6fcecdc5ee639f88c30868efa3b2a42c;hb=43113f26d3e61c96d896724c5509abe67b6a99e7;hp=c9c2de2858320725b75c30396e54e179bcc6b3da;hpb=b4c0033f297c28d95ad9298b489126331224bc42;p=Rakka.git

diff --git a/Rakka/Storage/Impl.hs b/Rakka/Storage/Impl.hs
index c9c2de2..e699163 100644
--- a/Rakka/Storage/Impl.hs
+++ b/Rakka/Storage/Impl.hs
@@ -16,6 +16,7 @@ import           Control.Monad
 import           Data.Maybe
 import           Data.Set (Set)
 import qualified Data.Set as S
+import           Data.Time
 import           Network.HTTP.Lucu
 import           Network.HTTP.Lucu.Utils
 import           Network.URI
@@ -25,6 +26,7 @@ import           Rakka.Page
 import           Rakka.Storage.DefaultPage
 import           Rakka.Storage.Repos
 import           Rakka.Storage.Types
+import           Rakka.W3CDateTime
 import           Subversion.Types
 import           Subversion.FileSystem
 import           Subversion.Repository
@@ -66,9 +68,7 @@ findAllPages repos rev = do reposPages   <- findAllPagesInRevision repos rev
 findChangedPages :: Repository -> RevNum -> RevNum -> IO (Set PageName)
 findChangedPages repos 0      newRev = findAllPages repos newRev
 findChangedPages repos oldRev newRev
-    = mapM (findChangedPagesAtRevision repos) [oldRev + 1 .. newRev]
-      >>=
-      return . S.unions
+    = liftM S.unions (mapM (findChangedPagesAtRevision repos) [oldRev + 1 .. newRev])
 
 
 getDirContents' :: Repository -> PageName -> Maybe RevNum -> IO [PageName]
@@ -158,6 +158,7 @@ openIndex indexDir revFile
                               $ removeFile revFile
 
                      Right index <- openDatabase indexDir (Writer [Create []])
+                     addAttrIndex index "@mdate"         SeqIndex
                      addAttrIndex index "@type"          StrIndex
                      addAttrIndex index "@uri"           SeqIndex
                      addAttrIndex index "rakka:revision" SeqIndex
@@ -206,8 +207,14 @@ searchIndex index cond
       fromId :: [String] -> DocumentID -> IO HitPage
       fromId words docId
           = do uri     <- getDocURI index docId
-               rev     <- getDocAttr index docId "rakka:revision"
-                          >>= return . read . fromJust
+               rev     <- unsafeInterleaveIO $
+                          liftM (read . fromJust)
+                                (getDocAttr index docId "rakka:revision")
+               lastMod <- unsafeInterleaveIO $
+                          liftM (zonedTimeToUTC . fromJust . parseW3CDateTime . fromJust)
+                                (getDocAttr index docId "@mdate")
+               summary <- unsafeInterleaveIO $
+                          getDocAttr index docId "rakka:summary"
                snippet <- unsafeInterleaveIO $
                           do doc <- getDocument index docId [NoAttributes, NoKeywords]
                              sn  <- makeSnippet doc words 300 80 80
@@ -215,6 +222,8 @@ searchIndex index cond
                return HitPage {
                             hpPageName = decodePageName $ uriPath uri
                           , hpPageRev  = rev
+                          , hpLastMod  = lastMod
+                          , hpSummary  = summary
                           , hpSnippet  = snippet
                           }
 
@@ -254,7 +263,7 @@ updateIndexRev revFile f = withFile revFile ReadWriteMode update
                     rev  <- if eof then
                                 return 0
                             else
-                                hGetLine h >>= return . read
+                                liftM read (hGetLine h)
                     rev' <- f rev
                     hSeek h AbsoluteSeek 0
                     hSetFileSize h 0