HitPage should contain more info

[Rakka.git] / Rakka / Wiki / Interpreter / PageList.hs

diff --git a/Rakka/Wiki/Interpreter/PageList.hs b/Rakka/Wiki/Interpreter/PageList.hs
index cffd93806f20c50b490dec6af1a9ac5596198a72..8631c8b4bae98d3929b98bbe369ce69925ed429a 100644 (file)
--- a/Rakka/Wiki/Interpreter/PageList.hs
+++ b/Rakka/Wiki/Interpreter/PageList.hs
@@ -7,7 +7,6 @@ import           Control.Monad
 import           Data.Maybe
 import           Data.Time
 import           Network.HTTP.Lucu.RFC1123DateTime
-import           Rakka.Page
 import           Rakka.Storage
 import           Rakka.Utils
 import           Rakka.Wiki
@@ -53,26 +52,20 @@ recentUpdatesInterp
                 setMax    cond items
 
                 result <- searchPages sto cond
-                pages  <- mapM (getPageByHP sto) (srPages result)
-
-                mkPageList showSummary pages
+                mkPageList showSummary (srPages result)
       }
     where
-      getPageByHP :: Storage -> HitPage -> IO Page
-      getPageByHP sto hp
-          = getPage sto (hpPageName hp) (Just (hpPageRev hp)) >>= return . fromJust
-
-      mkPageList :: Bool -> [Page] -> IO BlockElement
+      mkPageList :: Bool -> [HitPage] -> IO BlockElement
       mkPageList showSummary pages
           = do items <- mapM (mkListItem showSummary) pages
                return (Div [("class", "recentUpdates")]
                        [ Block (List Bullet items) ])
 
-      mkListItem :: Bool -> Page -> IO ListItem
+      mkListItem :: Bool -> HitPage -> IO ListItem
       mkListItem showSummary page
-          = do lastMod <- utcToLocalZonedTime (entityLastMod page)
+          = do lastMod <- utcToLocalZonedTime (hpLastMod page)
                return ( [ Inline ( PageLink {
-                                     linkPage     = Just (pageName page)
+                                     linkPage     = Just (hpPageName page)
                                    , linkFragment = Nothing
                                    , linkText     = Nothing
                                    }
@@ -82,7 +75,7 @@ recentUpdatesInterp
                                 )
                         ]
                         ++
-                        case (showSummary, entitySummary page) of
+                        case (showSummary, hpSummary page) of
                           (True, Just s)
                               -> [ Block (Paragraph [Text s]) ]
                           _   -> []