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

diff --git a/Rakka/Storage/Impl.hs b/Rakka/Storage/Impl.hs
index 442c412..e699163 100644
--- a/Rakka/Storage/Impl.hs
+++ b/Rakka/Storage/Impl.hs
@@ -68,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]
@@ -210,13 +208,11 @@ searchIndex index cond
       fromId words docId
           = do uri     <- getDocURI index docId
                rev     <- unsafeInterleaveIO $
-                          getDocAttr index docId "rakka:revision"
-                          >>=
-                          return . read . fromJust
+                          liftM (read . fromJust)
+                                (getDocAttr index docId "rakka:revision")
                lastMod <- unsafeInterleaveIO $
-                          getDocAttr index docId "@mdate"
-                          >>=
-                          return . zonedTimeToUTC . fromJust . parseW3CDateTime . fromJust
+                          liftM (zonedTimeToUTC . fromJust . parseW3CDateTime . fromJust)
+                                (getDocAttr index docId "@mdate")
                summary <- unsafeInterleaveIO $
                           getDocAttr index docId "rakka:summary"
                snippet <- unsafeInterleaveIO $
@@ -267,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