X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FWiki%2FInterpreter%2FBase.hs;h=bb4c4ad1ba24ad184c5ca3cc910c81a2d0371e0e;hb=89c3c6ff37517012b5a799014c5a6d05d3e2e902;hp=38578c0e590b53d4deb396a7a5da66476dbc84ef;hpb=fa3a9d0aecede2431e669ef33885a116f7d5f0be;p=Rakka.git
diff --git a/Rakka/Wiki/Interpreter/Base.hs b/Rakka/Wiki/Interpreter/Base.hs
index 38578c0..bb4c4ad 100644
--- a/Rakka/Wiki/Interpreter/Base.hs
+++ b/Rakka/Wiki/Interpreter/Base.hs
@@ -3,14 +3,17 @@ module Rakka.Wiki.Interpreter.Base
)
where
+import Control.Arrow
+import Control.Arrow.ListArrow
import Data.Map (Map)
import qualified Data.Map as M
import Data.Maybe
-import Network.URI
import Rakka.Page
import Rakka.SystemConfig
import Rakka.Wiki
import Rakka.Wiki.Interpreter
+import Text.XML.HXT.Arrow.XmlArrow
+import Text.XML.HXT.Arrow.XmlNodeSet
interpreters :: [Interpreter]
@@ -19,13 +22,15 @@ interpreters = [ lineBreakInterp
, divInterp
, pageNameInterp
, otherLangsInterp
+ , newPageInterp
, editPageInterp
+ , loginInterp
]
lineBreakInterp :: Interpreter
lineBreakInterp = InlineCommandInterpreter {
- iciName = "br"
+ iciName = "br"
, iciInterpret
= \ _ (InlineCommand _ attrs _) -> return $ LineBreak attrs
}
@@ -33,7 +38,7 @@ lineBreakInterp = InlineCommandInterpreter {
spanInterp :: Interpreter
spanInterp = InlineCommandInterpreter {
- iciName = "span"
+ iciName = "span"
, iciInterpret
= \ _ (InlineCommand _ attrs contents) -> return $ Span attrs contents
}
@@ -41,7 +46,7 @@ spanInterp = InlineCommandInterpreter {
divInterp :: Interpreter
divInterp = BlockCommandInterpreter {
- bciName = "div"
+ bciName = "div"
, bciInterpret
= \ _ (BlockCommand _ attrs contents)
-> return $ Div attrs (map Block contents)
@@ -50,7 +55,7 @@ divInterp = BlockCommandInterpreter {
pageNameInterp :: Interpreter
pageNameInterp = InlineCommandInterpreter {
- iciName = "pageName"
+ iciName = "pageName"
, iciInterpret
= \ ctx _ -> return $ Text (ctxPageName ctx)
}
@@ -59,56 +64,99 @@ pageNameInterp = InlineCommandInterpreter {
otherLangsInterp :: Interpreter
otherLangsInterp
= BlockCommandInterpreter {
- bciName = "inOtherLanguages"
+ bciName = "inOtherLanguages"
, bciInterpret
= \ ctx _ ->
- case fmap pageOtherLang (ctxMainPage ctx) of
- Nothing
- -> return EmptyBlock
-
- Just linkTable
- -> do Languages langTable <- getSysConf (ctxSysConf ctx)
- let merged = mergeTables langTable (M.toList linkTable)
- return $ mkLangList merged
+ let linkTable = case ctxMainPage ctx of
+ Just page -> runLA ( getXPathTreesInDoc "/page/otherLang/link"
+ >>>
+ ( getAttrValue0 "lang"
+ &&&
+ getAttrValue0 "page"
+ )
+ ) page
+ Nothing -> []
+ in
+ case linkTable of
+ [] -> return EmptyBlock
+ _ -> do Languages langTable <- getSysConf (ctxSysConf ctx)
+ let merged = mergeTables langTable linkTable
+ return $ mkLangList merged
}
where
mergeTables :: Map LanguageTag LanguageName
-> [(LanguageTag, PageName)]
-> [(LanguageName, PageName)]
mergeTables _ [] = []
- mergeTables m (x:xs) = let (langTag, pageName) = x
- langName = fromMaybe langTag (M.lookup langTag m)
+ mergeTables m (x:xs) = let (langTag, name) = x
+ langName = fromMaybe langTag (M.lookup langTag m)
in
- (langName, pageName) : mergeTables m xs
+ (langName, name) : mergeTables m xs
mkLangList :: [(LanguageName, PageName)] -> BlockElement
mkLangList xs = List Bullet (map mkLangLink xs)
mkLangLink :: (LanguageName, PageName) -> ListItem
- mkLangLink (langName, pageName)
- = [Inline (PageLink (Just pageName) Nothing (Just langName))]
+ mkLangLink (langName, name)
+ = [Inline (PageLink (Just name) Nothing (Just langName))]
+
+
+--
+newPageInterp :: Interpreter
+newPageInterp
+ = InlineCommandInterpreter {
+ iciName = "newPage"
+ , iciInterpret
+ = \ _ (InlineCommand _ args _) ->
+ let label = fromMaybe "Create new page" (lookup "label" args)
+ attrs = [ ("type" , "button")
+ , ("value" , label)
+ , ("onclick", "Rakka.newPage()")
+ , ("class" , "newButton")
+ ]
+ in
+ return (Input attrs)
+ }
--
editPageInterp :: Interpreter
editPageInterp
= InlineCommandInterpreter {
- iciName = "editPage"
+ iciName = "editPage"
, iciInterpret
= \ ctx (InlineCommand _ args _) ->
- do BaseURI baseURI <- getSysConf (ctxSysConf ctx)
-
- let pageName = fromMaybe (ctxPageName ctx) (lookup "page" args)
- label = fromMaybe "Edit this page" (lookup "label" args)
- uri = uriToString id baseURI ""
- attrs = [ ("type" , "button")
- , ("value" , label)
- , ("onclick", "Rakka.editPage(\"" ++ uri ++ "\", \"" ++ pageName ++ "\")")
- , ("class" , "editButton")
- ]
-
- return (Input attrs)
+ let name = fromMaybe (ctxPageName ctx) (lookup "page" args)
+ label = fromMaybe "Edit this page" (lookup "label" args)
+ attrs = [ ("type" , "button")
+ , ("value" , label)
+ , ("onclick", "Rakka.editPage(\"" ++ name ++ "\")")
+ , ("class" , "editButton")
+ ]
+ in
+ return (Input attrs)
}
+
+
+--
+loginInterp :: Interpreter
+loginInterp
+ = InlineCommandInterpreter {
+ iciName = "login"
+ , iciInterpret
+ = \ _ _ ->
+ let attrs = [ ("type" , "button")
+ , ("value" , "Login")
+ , ("class" , "loginButton")
+ ]
+ in
+ return (Input attrs)
+ }
\ No newline at end of file