X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FWiki%2FInterpreter%2FPageList.hs;h=4faee0f091ca48f2fd1cdce27895308d8eb2984f;hb=45bce2c29948649f74ada71f2fa851bdb812e96c;hp=234ce7d007498d9f3b66893a2c02ae69b3d46bca;hpb=7a4f13a3d483c950743e1ced001ade4406d239d3;p=Rakka.git
diff --git a/Rakka/Wiki/Interpreter/PageList.hs b/Rakka/Wiki/Interpreter/PageList.hs
index 234ce7d..4faee0f 100644
--- a/Rakka/Wiki/Interpreter/PageList.hs
+++ b/Rakka/Wiki/Interpreter/PageList.hs
@@ -1,20 +1,51 @@
+{-# LANGUAGE
+ OverloadedStrings
+ , RecordWildCards
+ , UnicodeSyntax
+ #-}
module Rakka.Wiki.Interpreter.PageList
( interpreters
)
where
-
-import Data.Maybe
+import Control.Applicative
+import Control.Monad
+import qualified Data.ByteString.Char8 as C8
+import Data.Maybe
+import Data.Monoid.Unicode
+import qualified Data.Text as T
import Data.Time
-import Network.HTTP.Lucu.RFC1123DateTime
-import Rakka.Page
+import qualified Data.Time.RFC1123 as RFC1123
+import Network.URI
+import Prelude.Unicode
import Rakka.Storage
+import Rakka.SystemConfig
+import Rakka.Utils
import Rakka.Wiki
import Rakka.Wiki.Interpreter
+import System.FilePath
import Text.HyperEstraier
interpreters :: [Interpreter]
-interpreters = [ recentUpdatesInterp ]
+interpreters = [ recentUpdatesURLInterp
+ , recentUpdatesInterp
+ ]
+
+
+recentUpdatesURLInterp :: Interpreter
+recentUpdatesURLInterp
+ = InlineCommandInterpreter {
+ iciName = "recentUpdatesURL"
+ , iciInterpret
+ = \ ctx _ -> do BaseURI baseURI <- getSysConf (ctxSysConf ctx)
+ let uri = baseURI {
+ uriPath = uriPath baseURI > "search.html"
+ , uriQuery = '?' : C8.unpack (mkQueryString [ ("q" , "[UVSET]")
+ , ("order", "@mdate NUMD")
+ ])
+ }
+ return $ ExternalLink uri (Just "List all pages")
+ }
--
@@ -29,51 +60,49 @@ interpreters = [ recentUpdatesInterp ]
-- ...
--
--
-recentUpdatesInterp :: Interpreter
+recentUpdatesInterp â· Interpreter
recentUpdatesInterp
= BlockCommandInterpreter {
bciName = "recentUpdates"
, bciInterpret
- = \ ctx (BlockCommand _ args _)
- -> do let items = fromMaybe 10 $ fmap read $ lookup "items" args
- sto = ctxStorage ctx
-
- cond <- newCondition
- setPhrase cond "[UVSET]"
- addAttrCond cond "rakka:isBoring STREQ no"
- addAttrCond cond "rakka:summary STRNE" -- summary ã空ã§ãªã
- setOrder cond "@mdate NUMD"
- setMax cond items
-
- result <- searchPages sto cond
- pages <- mapM ( \ (name, rev)
- -> getPage sto name (Just rev) >>= return . fromJust
- ) result
-
- mkPageList pages
+ = \(InterpreterContext {..}) (BlockCommand _ args _) â
+ do let items = fromMaybe 10 $ read â T.unpack <$> lookup "items" args
+ showSummary = fromMaybe True $ parseYesOrNo <$> lookup "showSummary" args
+ onlyEntity = fromMaybe True $ parseYesOrNo <$> lookup "onlyEntity" args
+ onlySummarized = fromMaybe True $ parseYesOrNo <$> lookup "onlySummarized" args
+ cond â newCondition
+ when onlyEntity
+ $ addAttrCond cond "@type STRNE application/x-rakka-redirection"
+ when onlySummarized
+ $ addAttrCond cond "rakka:summary STRNE" -- summary ã空ã§ãªã
+ setPhrase cond "[UVSET]"
+ setOrder cond "@mdate NUMD"
+ setMax cond items
+ result â searchPages ctxStorage cond
+ mkPageList showSummary (srPages result)
}
where
- mkPageList :: [Page] -> IO BlockElement
- mkPageList pages
- = do items <- mapM mkListItem pages
+ mkPageList :: Bool -> [HitPage] -> IO BlockElement
+ mkPageList showSummary pages
+ = do items <- mapM (mkListItem showSummary) pages
return (Div [("class", "recentUpdates")]
[ Block (List Bullet items) ])
- mkListItem :: Page -> IO ListItem
- mkListItem page
- = do lastMod <- utcToLocalZonedTime (pageLastMod page)
- return ( [ Inline ( PageLink {
- linkPage = Just (pageName page)
- , linkFragment = Nothing
- , linkText = Nothing
- }
- )
+ mkListItem â· Bool â HitPage â IO ListItem
+ mkListItem showSummary page
+ = do lastMod â utcToLocalZonedTime (hpLastMod page)
+ return ( [ Inline PageLink {
+ linkPage = Just (hpPageName page)
+ , linkFragment = Nothing
+ , linkText = Nothing
+ }
, Block ( Div [("class", "date")]
- [Inline (Text (formatRFC1123DateTime lastMod))]
+ [Inline (Text (T.pack $ RFC1123.format lastMod))]
)
]
- ++
- case pageSummary page of
- Just s -> [ Block (Paragraph [Text s]) ]
- Nothing -> []
+ â
+ case (showSummary, hpSummary page) of
+ (True, Just s)
+ â [ Block (Paragraph [Text s]) ]
+ _ â []
)