we can now create new pages

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

diff --git a/Rakka/Wiki/Interpreter/Base.hs b/Rakka/Wiki/Interpreter/Base.hs
index 38578c0e590b53d4deb396a7a5da66476dbc84ef..6feb92a77c82dcec77157cf3f0bff2929328a06f 100644 (file)
--- a/Rakka/Wiki/Interpreter/Base.hs
+++ b/Rakka/Wiki/Interpreter/Base.hs
@@ -3,6 +3,8 @@ 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
@@ -11,6 +13,8 @@ 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,6 +23,7 @@ interpreters = [ lineBreakInterp
                , divInterp
                , pageNameInterp
                , otherLangsInterp
+               , newPageInterp
                , editPageInterp
                ]
 
@@ -62,31 +67,62 @@ otherLangsInterp
         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))]
+
+
+-- <input type="button"
+--        value="Create new page"
+--        onclick="Rakka.newPage(\"http://example.org/\")"
+--        class="newButton" />
+newPageInterp :: Interpreter
+newPageInterp 
+    = InlineCommandInterpreter {
+        iciName      = "newPage"
+      , iciInterpret
+          = \ ctx (InlineCommand _ args _) ->
+            do BaseURI baseURI <- getSysConf (ctxSysConf ctx)
+               
+               let label = fromMaybe "Create new page" (lookup "label" args)
+                   uri   = uriToString id baseURI ""
+                   attrs = [ ("type"   , "button")
+                           , ("value"  , label)
+                           , ("onclick", "Rakka.newPage(\"" ++ uri ++ "\")")
+                           , ("class"  , "newButton")
+                           ]
+
+               return (Input attrs)
+      }
 
 
 -- <input type="button"
@@ -101,14 +137,14 @@ editPageInterp
           = \ 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")
-                              ]
+               let name  = 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 ++ "\", \"" ++ name ++ "\")")
+                           , ("class"  , "editButton")
+                           ]
 
                return (Input attrs)
       }