[The big change
pho@cielonegro.org**20071030102656] {
move ./Rakka/Resource/Render.hs ./Rakka/Resource/PageEntity.hs
hunk ./Main.hs 10
+import Rakka.Resource.PageEntity
hunk ./Main.hs 12
-import Rakka.Resource.Render
hunk ./Main.hs 131
- runHttpd (envLucuConf env) (resTree env) [fallbackRender env]
+ runHttpd (envLucuConf env) (resTree env) [fallbackPageEntity env]
hunk ./Rakka.cabal 54
- Rakka.Resource.Render
+ Rakka.Resource.PageEntity
hunk ./Rakka/Environment.hs 8
+import Control.Arrow
+import Control.Arrow.ArrowList
hunk ./Rakka/Environment.hs 13
+import Rakka.Page
hunk ./Rakka/Environment.hs 28
+import Text.HyperEstraier
+import Text.XML.HXT.Arrow.XmlIOStateArrow
hunk ./Rakka/Environment.hs 61
- storage <- mkStorage lsdir repos (makeDraft interpTable)
+ storage <- mkStorage lsdir repos (makeDraft' interpTable)
hunk ./Rakka/Environment.hs 71
+ where
+ makeDraft' :: InterpTable -> Page -> IO Document
+ makeDraft' interpTable page
+ = do [doc] <- runX ( setErrorMsgHandler False fail
+ >>>
+ constA page
+ >>>
+ xmlizePage
+ >>>
+ makeDraft interpTable
+ )
+ return doc
hunk ./Rakka/Page.hs 11
+ , defaultFileName
hunk ./Rakka/Page.hs 93
-pageFileName' page = fromMaybe (defaultFileName page) (pageFileName page)
+pageFileName' page
+ = fromMaybe (defaultFileName (pageType page) (pageName page)) (pageFileName page)
hunk ./Rakka/Page.hs 97
-defaultFileName :: Page -> String
-defaultFileName page
- = let baseName = takeFileName (pageName page)
+defaultFileName :: MIMEType -> PageName -> String
+defaultFileName pType pName
+ = let baseName = takeFileName pName
hunk ./Rakka/Page.hs 101
- case pageType page of
+ case pType of
hunk ./Rakka/Resource/PageEntity.hs 1
-module Rakka.Resource.Render
- ( fallbackRender
+module Rakka.Resource.PageEntity
+ ( fallbackPageEntity
hunk ./Rakka/Resource/PageEntity.hs 9
+import Control.Arrow.ArrowList
hunk ./Rakka/Resource/PageEntity.hs 11
+import Data.Maybe
hunk ./Rakka/Resource/PageEntity.hs 14
+import Network.URI
hunk ./Rakka/Resource/PageEntity.hs 23
-import Text.XML.HXT.Arrow.Namespace
hunk ./Rakka/Resource/PageEntity.hs 28
-fallbackRender :: Environment -> [String] -> IO (Maybe ResourceDef)
-fallbackRender env path
+fallbackPageEntity :: Environment -> [String] -> IO (Maybe ResourceDef)
+fallbackPageEntity env path
hunk ./Rakka/Resource/PageEntity.hs 73
-{-
- -- デフォルトでない場合のみ存在
- lastModified="2000-01-01T00:00:00">
-
-
-
-
-
-
-
-
-
-
- blah blah...
- -- 存在しない場合もある
-
- -- 存在しない場合もある
-
-
-
-
- blah blah...
-
-
-
-
- blah blah...
-
-
- blah blah...
-
-
-
-
- blah blah...
-
-
-
- blah blah...
-
-
--}
hunk ./Rakka/Resource/PageEntity.hs 76
- -> do tree <- formatEntirePage (envStorage env) (envSysConf env) (envInterpTable env) -< page
+ -> do tree <- xmlizePage -< page
hunk ./Rakka/Resource/PageEntity.hs 89
- outputXmlPage tree entityToXHTML
+ outputXmlPage tree (entityToXHTML env)
hunk ./Rakka/Resource/PageEntity.hs 92
-entityToXHTML :: ArrowXml a => a XmlTree XmlTree
-entityToXHTML
- = eelem "/"
- += ( eelem "html"
- += sattr "xmlns" "http://www.w3.org/1999/xhtml"
- += ( getXPathTreesInDoc "/page/@lang"
- `guards`
- qattr (QN "xml" "lang" "")
- ( getXPathTreesInDoc "/page/@lang/text()" )
- )
- += ( eelem "head"
- += ( eelem "title"
- += getXPathTreesInDoc "/page/@site/text()"
- += txt " - "
- += getXPathTreesInDoc "/page/@name/text()"
- )
- += ( getXPathTreesInDoc "/page/styleSheets/styleSheet"
- >>>
- eelem "link"
- += sattr "rel" "stylesheet"
- += sattr "type" "text/css"
- += attr "href"
- ( getXPathTrees "/styleSheet/@src/text()" )
- )
- += ( getXPathTreesInDoc "/page/scripts/script"
- >>>
- eelem "script"
- += sattr "type" "text/javascript"
- += attr "src"
- ( getXPathTrees "/script/@src/text()" )
- )
- )
- += ( eelem "body"
- += ( eelem "div"
- += sattr "class" "header"
- )
- += ( eelem "div"
- += sattr "class" "center"
- += ( eelem "div"
- += sattr "class" "title"
- += getXPathTreesInDoc "/page/pageTitle/*"
- )
- += ( eelem "div"
- += sattr "class" "body"
- += getXPathTreesInDoc "/page/body/*"
- )
- )
- += ( eelem "div"
- += sattr "class" "footer"
- )
- += ( eelem "div"
- += sattr "class" "left sideBar"
- += ( eelem "div"
- += sattr "class" "content"
- += getXPathTreesInDoc "/page/sideBar/left/*"
- )
- )
- += ( eelem "div"
- += sattr "class" "right sideBar"
- += ( eelem "div"
- += sattr "class" "content"
- += getXPathTreesInDoc "/page/sideBar/right/*"
- )
- )
- )
- >>>
- uniqueNamespacesFromDeclAndQNames
- )
+entityToXHTML :: (ArrowXml a, ArrowChoice a, ArrowIO a) => Environment -> a XmlTree XmlTree
+entityToXHTML env
+ = proc page
+ -> do SiteName siteName <- getSysConfA (envSysConf env) -< ()
+ BaseURI baseURI <- getSysConfA (envSysConf env) -< ()
+ StyleSheet styleSheet <- getSysConfA (envSysConf env) -< ()
hunk ./Rakka/Resource/PageEntity.hs 99
+ pageName <- (getXPathTreesInDoc "/page/@name/text()" >>> getText) -< page
hunk ./Rakka/Resource/PageEntity.hs 101
-{-
-
+ let cssHref = [uriToString id (mkObjectURI baseURI styleSheet) ""]
+ scriptSrc = [uriToString id (baseURI { uriPath = uriPath baseURI "js" }) ""]
+
+ pageTitle <- listA (readSubPage env) -< (pageName, Just page, "PageTitle")
+ leftSideBar <- listA (readSubPage env) -< (pageName, Just page, "SideBar/Left")
+ rightSideBar <- listA (readSubPage env) -< (pageName, Just page, "SideBar/Right")
+ pageBody <- listA (makeMainXHTML (envStorage env) (envSysConf env) (envInterpTable env)) -< page
hunk ./Rakka/Resource/PageEntity.hs 109
-
-
-
+ ( eelem "/"
+ += ( eelem "html"
+ += sattr "xmlns" "http://www.w3.org/1999/xhtml"
+ += ( getXPathTreesInDoc "/page/@lang"
+ `guards`
+ qattr (QN "xml" "lang" "")
+ ( getXPathTreesInDoc "/page/@lang/text()" )
+ )
+ += ( eelem "head"
+ += ( eelem "title"
+ += txt siteName
+ += txt " - "
+ += getXPathTreesInDoc "/page/@name/text()"
+ )
+ += ( constL cssHref
+ >>>
+ eelem "link"
+ += sattr "rel" "stylesheet"
+ += sattr "type" "text/css"
+ += attr "href" (arr id >>> mkText)
+ )
+ += ( constL scriptSrc
+ >>>
+ eelem "script"
+ += sattr "type" "text/javascript"
+ += attr "src" (arr id >>> mkText)
+ )
+ )
+ += ( eelem "body"
+ += ( eelem "div"
+ += sattr "class" "header"
+ )
+ += ( eelem "div"
+ += sattr "class" "center"
+ += ( eelem "div"
+ += sattr "class" "title"
+ += constL pageTitle
+ )
+ += ( eelem "div"
+ += sattr "class" "body"
+ += constL pageBody
+ )
+ )
+ += ( eelem "div"
+ += sattr "class" "footer"
+ )
+ += ( eelem "div"
+ += sattr "class" "left sideBar"
+ += ( eelem "div"
+ += sattr "class" "content"
+ += constL leftSideBar
+ )
+ )
+ += ( eelem "div"
+ += sattr "class" "right sideBar"
+ += ( eelem "div"
+ += sattr "class" "content"
+ += constL rightSideBar
+ )
+ )
+ )
+ ) ) -<< page
hunk ./Rakka/Resource/PageEntity.hs 172
-
-
-
hunk ./Rakka/Resource/PageEntity.hs 173
-
- blah blah...
-
+readSubPage :: (ArrowXml a, ArrowChoice a, ArrowIO a) =>
+ Environment
+ -> a (PageName, Maybe XmlTree, PageName) XmlTree
+readSubPage env
+ = proc (mainPageName, mainPage, subPageName) ->
+ do subPage <- getPageA (envStorage env) >>> arr fromJust >>> xmlizePage -< (subPageName, Nothing)
+ subXHTML <- makeSubXHTML (envStorage env) (envSysConf env) (envInterpTable env)
+ -< (mainPageName, mainPage, subPage)
+ returnA -< subXHTML
hunk ./Rakka/Resource/PageEntity.hs 183
-
-
- blah blah...
-
-
- blah blah...
-
-
-
+
+{-
+
hunk ./Rakka/Resource/PageEntity.hs 190
- -> do tree <- formatUnexistentPage (envStorage env) (envSysConf env) (envInterpTable env) -< name
+ -> do tree <- ( eelem "/"
+ += ( eelem "pageNotFound"
+ += attr "name" (arr id >>> mkText)
+ )
+ ) -< name
hunk ./Rakka/Resource/PageEntity.hs 196
- outputXmlPage tree notFoundToXHTML
+ outputXmlPage tree (notFoundToXHTML env)
+
+
+notFoundToXHTML :: (ArrowXml a, ArrowChoice a, ArrowIO a) => Environment -> a XmlTree XmlTree
+notFoundToXHTML env
+ = proc pageNotFound
+ -> do SiteName siteName <- getSysConfA (envSysConf env) -< ()
+ BaseURI baseURI <- getSysConfA (envSysConf env) -< ()
+ StyleSheet styleSheet <- getSysConfA (envSysConf env) -< ()
+
+ pageName <- (getXPathTreesInDoc "/pageNotFound/@name/text()" >>> getText) -< pageNotFound
+
+ let cssHref = [uriToString id (mkObjectURI baseURI styleSheet) ""]
+ scriptSrc = [uriToString id (baseURI { uriPath = uriPath baseURI "js" }) ""]
hunk ./Rakka/Resource/PageEntity.hs 211
+ pageTitle <- listA (readSubPage env) -< (pageName, Nothing, "PageTitle")
+ leftSideBar <- listA (readSubPage env) -< (pageName, Nothing, "SideBar/Left")
+ rightSideBar <- listA (readSubPage env) -< (pageName, Nothing, "SideBar/Right")
hunk ./Rakka/Resource/PageEntity.hs 215
-notFoundToXHTML :: ArrowXml a => a XmlTree XmlTree
-notFoundToXHTML
- = eelem "/"
- += ( eelem "html"
- += sattr "xmlns" "http://www.w3.org/1999/xhtml"
- += ( eelem "head"
- += ( eelem "title"
- += getXPathTreesInDoc "/pageNotFound/@site/text()"
- += txt " - "
- += getXPathTreesInDoc "/pageNotFound/@name/text()"
- )
- += ( getXPathTreesInDoc "/pageNotFound/styleSheets/styleSheet"
- >>>
- eelem "link"
- += sattr "rel" "stylesheet"
- += sattr "type" "text/css"
- += attr "href"
- ( getXPathTrees "/styleSheet/@src/text()" )
- )
- += ( getXPathTreesInDoc "/pageNotFound/scripts/script"
- >>>
- eelem "script"
- += sattr "type" "text/javascript"
- += attr "src"
- ( getXPathTrees "/script/@src/text()" )
- )
- )
- += ( eelem "body"
- += ( eelem "div"
- += sattr "class" "header"
- )
- += ( eelem "div"
- += sattr "class" "center"
- += ( eelem "div"
- += sattr "class" "title"
- += getXPathTreesInDoc "/pageNotFound/pageTitle/*"
- )
- += ( eelem "div"
- += sattr "class" "body"
- += txt "404 Not Found (FIXME)" -- FIXME
- )
- )
- += ( eelem "div"
- += sattr "class" "footer"
- )
- += ( eelem "div"
- += sattr "class" "left sideBar"
- += ( eelem "div"
- += sattr "class" "content"
- += getXPathTreesInDoc "/pageNotFound/sideBar/left/*"
- )
- )
- += ( eelem "div"
- += sattr "class" "right sideBar"
- += ( eelem "div"
- += sattr "class" "content"
- += getXPathTreesInDoc "/pageNotFound/sideBar/right/*"
- )
- )
- )
- >>>
- uniqueNamespacesFromDeclAndQNames
- )
+ ( eelem "/"
+ += ( eelem "html"
+ += sattr "xmlns" "http://www.w3.org/1999/xhtml"
+ += ( eelem "head"
+ += ( eelem "title"
+ += txt siteName
+ += txt " - "
+ += getXPathTreesInDoc "/pageNotFound/@name/text()"
+ )
+ += ( constL cssHref
+ >>>
+ eelem "link"
+ += sattr "rel" "stylesheet"
+ += sattr "type" "text/css"
+ += attr "href" (arr id >>> mkText)
+ )
+ += ( constL scriptSrc
+ >>>
+ eelem "script"
+ += sattr "type" "text/javascript"
+ += attr "src" (arr id >>> mkText)
+ )
+ )
+ += ( eelem "body"
+ += ( eelem "div"
+ += sattr "class" "header"
+ )
+ += ( eelem "div"
+ += sattr "class" "center"
+ += ( eelem "div"
+ += sattr "class" "title"
+ += constL pageTitle
+ )
+ += ( eelem "div"
+ += sattr "class" "body"
+ += txt "404 Not Found (FIXME)" -- FIXME
+ )
+ )
+ += ( eelem "div"
+ += sattr "class" "footer"
+ )
+ += ( eelem "div"
+ += sattr "class" "left sideBar"
+ += ( eelem "div"
+ += sattr "class" "content"
+ += constL leftSideBar
+ )
+ )
+ += ( eelem "div"
+ += sattr "class" "right sideBar"
+ += ( eelem "div"
+ += sattr "class" "content"
+ += constL rightSideBar
+ )
+ )
+ )
+ ) ) -<< pageNotFound
hunk ./Rakka/Wiki.hs 77
- imgSource :: !PageName
+ imgSource :: !(PageName)
hunk ./Rakka/Wiki/Engine.hs 3
- , formatEntirePage
- , formatUnexistentPage
+ , xmlizePage
+ , makeMainXHTML
+ , makeSubXHTML
hunk ./Rakka/Wiki/Engine.hs 10
+import qualified Codec.Binary.Base64 as B64
hunk ./Rakka/Wiki/Engine.hs 14
+import qualified Data.ByteString.Lazy as L
hunk ./Rakka/Wiki/Engine.hs 33
-import Text.XML.HXT.Arrow.Namespace
hunk ./Rakka/Wiki/Engine.hs 34
+import Text.XML.HXT.Arrow.XmlNodeSet
hunk ./Rakka/Wiki/Engine.hs 41
-formatEntirePage :: (ArrowXml a, ArrowChoice a, ArrowIO a) =>
- Storage
- -> SystemConfig
- -> InterpTable
- -> a Page XmlTree
-formatEntirePage sto sysConf interpTable
- = proc page
- -> do SiteName siteName <- getSysConfA sysConf -< ()
- BaseURI baseURI <- getSysConfA sysConf -< ()
- StyleSheet cssName <- getSysConfA sysConf -< ()
-
- Just pageTitle <- getPageA sto -< ("PageTitle" , Nothing)
- Just leftSideBar <- getPageA sto -< ("SideBar/Left" , Nothing)
- Just rightSideBar <- getPageA sto -< ("SideBar/Right", Nothing)
-
- tree <- ( eelem "/"
- += ( eelem "page"
- += sattr "site" siteName
- += sattr "baseURI" (uriToString id baseURI "")
- += sattr "name" (pageName page)
- += sattr "type" (show $ pageType page)
- += ( case pageLanguage page of
- Just x -> sattr "lang" x
- _ -> none
- )
- += ( case pageFileName page of
- Just x -> sattr "fileName" x
- _ -> none
- )
- += ( case pageType page of
- MIMEType "text" "css" _
- -> sattr "isTheme" (yesOrNo $ pageIsTheme page)
- _ -> none
- )
- += ( case pageType page of
- MIMEType "text" "x-rakka" _
- -> sattr "isFeed" (yesOrNo $ pageIsFeed page)
- _ -> none
- )
- += sattr "isLocked" (yesOrNo $ pageIsLocked page)
- += sattr "isBoring" (yesOrNo $ pageIsBoring page)
- += sattr "isBinary" (yesOrNo $ pageIsBinary page)
- += sattr "revision" (show $ pageRevision page)
- += sattr "lastModified" (formatW3CDateTime $ pageLastMod page)
-
- += ( eelem "styleSheets"
- += ( eelem "styleSheet"
- += sattr "src" (uriToString id (mkObjectURI baseURI cssName) "")
- )
- )
+{-
+ -- デフォルトでない場合のみ存在
+ lastModified="2000-01-01T00:00:00">
hunk ./Rakka/Wiki/Engine.hs 53
- += ( eelem "scripts"
- += ( eelem "script"
- += sattr "src" (uriToString id (baseURI { uriPath = "/js" }) "")
- )
- )
+
+ blah blah...
+ -- 存在しない場合もある
hunk ./Rakka/Wiki/Engine.hs 57
- += ( case pageSummary page of
- Nothing -> none
- Just s -> eelem "summary" += txt s
- )
-
- += ( if M.null (pageOtherLang page) then
- none
- else
- selem "otherLang"
- [ eelem "link"
- += sattr "lang" lang
- += sattr "page" page
- | (lang, page) <- M.toList (pageOtherLang page) ]
- )
- += ( eelem "pageTitle"
- += ( (constA (pageName page) &&& constA (Just page) &&& constA pageTitle)
- >>>
- formatSubPage sto sysConf interpTable
- )
- )
- += ( eelem "sideBar"
- += ( eelem "left"
- += ( (constA (pageName page) &&& constA (Just page) &&& constA leftSideBar)
- >>>
- formatSubPage sto sysConf interpTable
- )
- )
- += ( eelem "right"
- += ( (constA (pageName page) &&& constA (Just page) &&& constA rightSideBar)
- >>>
- formatSubPage sto sysConf interpTable
- )
- )
- )
- += ( eelem "body"
- += (constA page >>> formatMainPage sto sysConf interpTable)
- )
- += (constA page >>> formatSource)
- >>>
- uniqueNamespacesFromDeclAndQNames
- )
- ) -<< ()
- returnA -< tree
-
-
-formatSource :: (ArrowXml a, ArrowChoice a) => a Page XmlTree
-formatSource = proc page
- -> if pageIsBinary page then
- none -< ()
- else
- let source = decodeLazy UTF8 (pageContent page)
- in
- ( eelem "source" += mkText ) -< source
+ -- 存在しない場合もある
+
+
hunk ./Rakka/Wiki/Engine.hs 61
+
+
+ blah blah...
+
+
+ SKJaHKS8JK/DH8KS43JDK2aKKaSFLLS...
+
+
+-}
+xmlizePage :: (ArrowXml a, ArrowChoice a) => a Page XmlTree
+xmlizePage
+ = proc page
+ -> (eelem "/"
+ += ( eelem "page"
+ += sattr "name" (pageName page)
+ += sattr "type" (show $ pageType page)
+ += ( case pageLanguage page of
+ Just x -> sattr "lang" x
+ Nothing -> none
+ )
+ += ( case pageFileName page of
+ Just x -> sattr "fileName" x
+ Nothing -> none
+ )
+ += ( case pageType page of
+ MIMEType "text" "css" _
+ -> sattr "isTheme" (yesOrNo $ pageIsTheme page)
+ MIMEType "text" "x-rakka" _
+ -> sattr "isFeed" (yesOrNo $ pageIsFeed page)
+ _
+ -> none
+ )
+ += sattr "isLocked" (yesOrNo $ pageIsLocked page)
+ += sattr "isBoring" (yesOrNo $ pageIsBoring page)
+ += sattr "isBinary" (yesOrNo $ pageIsBinary page)
+ += sattr "revision" (show $ pageRevision page)
+ += sattr "lastModified" (formatW3CDateTime $ pageLastMod page)
+ += ( case pageSummary page of
+ Just s -> eelem "summary" += txt s
+ Nothing -> none
+ )
+ += ( if M.null (pageOtherLang page) then
+ none
+ else
+ selem "otherLang"
+ [ eelem "link"
+ += sattr "lang" lang
+ += sattr "page" page
+ | (lang, page) <- M.toList (pageOtherLang page) ]
+ )
+ += ( if pageIsBinary page then
+ ( eelem "binaryData"
+ += txt (B64.encode $ L.unpack $ pageContent page)
+ )
+ else
+ ( eelem "textData"
+ += txt (decodeLazy UTF8 $ pageContent page)
+ )
+ )
+ )
+ ) -<< ()
hunk ./Rakka/Wiki/Engine.hs 123
-formatUnexistentPage :: (ArrowXml a, ArrowChoice a, ArrowIO a) =>
- Storage
- -> SystemConfig
- -> InterpTable
- -> a PageName XmlTree
-formatUnexistentPage sto sysConf interpTable
- = proc name
- -> do SiteName siteName <- getSysConfA sysConf -< ()
- BaseURI baseURI <- getSysConfA sysConf -< ()
- StyleSheet cssName <- getSysConfA sysConf -< ()
hunk ./Rakka/Wiki/Engine.hs 124
- Just pageTitle <- getPageA sto -< ("PageTitle" , Nothing)
- Just leftSideBar <- getPageA sto -< ("SideBar/Left" , Nothing)
- Just rightSideBar <- getPageA sto -< ("SideBar/Right", Nothing)
+wikifyPage :: (ArrowXml a, ArrowChoice a) => InterpTable -> a XmlTree WikiPage
+wikifyPage interpTable
+ = proc tree
+ -> do pName <- getXPathTreesInDoc "/page/@name/text()" >>> getText -< tree
+ pType <- getXPathTreesInDoc "/page/@type/text()" >>> getText >>> arr read -< tree
+ pIsBinary <- getXPathTreesInDoc "/page/@isBinary/text()" >>> getText -< tree
+ pFileName <- maybeA (getXPathTreesInDoc "/page/fileName/text()" >>> getText) -< tree
+ textData <- maybeA (getXPathTreesInDoc "/page/textData/text()" >>> getText) -< tree
hunk ./Rakka/Wiki/Engine.hs 133
- tree <- ( eelem "/"
- += ( eelem "pageNotFound"
- += sattr "site" siteName
- += sattr "baseURI" (uriToString id baseURI "")
- += sattr "name" name
+ case pType of
+ MIMEType "text" "x-rakka" _
+ -> case parse (wikiPage cmdTypeOf) "" (fromJust textData) of
+ Left err -> wikifyParseError -< err
+ Right xs -> returnA -< xs
hunk ./Rakka/Wiki/Engine.hs 139
- += ( eelem "styleSheets"
- += ( eelem "styleSheet"
- += sattr "src" (uriToString id (mkObjectURI baseURI cssName) "")
- )
- )
+ MIMEType "image" _ _
+ -> returnA -< [ Paragraph [Image pName Nothing] ]
hunk ./Rakka/Wiki/Engine.hs 142
- += ( eelem "scripts"
- += ( eelem "script"
- += sattr "src" (uriToString id (baseURI { uriPath = "/js" }) "")
- )
- )
-
- += ( eelem "pageTitle"
- += ( (constA name &&& constA Nothing &&& constA pageTitle)
- >>>
- formatSubPage sto sysConf interpTable
- )
- )
- += ( eelem "sideBar"
- += ( eelem "left"
- += ( (constA name &&& constA Nothing &&& constA leftSideBar)
- >>>
- formatSubPage sto sysConf interpTable
- )
- )
- += ( eelem "right"
- += ( (constA name &&& constA Nothing &&& constA rightSideBar)
- >>>
- formatSubPage sto sysConf interpTable
- )
- )
- )
- >>>
- uniqueNamespacesFromDeclAndQNames
- )
- ) -<< ()
- returnA -< tree
+ _ -> if pIsBinary == "yes" then
+ returnA -< [ Paragraph [ ObjectLink {
+ objLinkPage = pName
+ , objLinkText = Just $ fromMaybe (defaultFileName pType pName) pFileName
+ }
+ ]
+ ]
+ else
+ -- pre
+ returnA -< [ Preformatted [Text $ fromJust textData] ]
+ where
+ cmdTypeOf :: String -> Maybe CommandType
+ cmdTypeOf name
+ = fmap commandType (M.lookup name interpTable)
hunk ./Rakka/Wiki/Engine.hs 157
+ binToURI :: MIMEType -> String -> URI
+ binToURI pType base64Data
+ = nullURI {
+ uriScheme = "data:"
+ , uriPath = show pType ++ ";base64," ++ (stripWhiteSpace base64Data)
+ }
hunk ./Rakka/Wiki/Engine.hs 164
-formatMainPage :: (ArrowXml a, ArrowChoice a, ArrowIO a) =>
- Storage
- -> SystemConfig
- -> InterpTable
- -> a Page XmlTree
-formatMainPage sto sysConf interpTable
- = proc page
- -> do BaseURI baseURI <- getSysConfA sysConf -< ()
- wiki <- arr2 wikifyPage -< (interpTable, page)
- xs <- interpretCommandsA sto sysConf interpTable
- -< (pageName page, Just (page, wiki), wiki)
- formatWikiBlocks -< (baseURI, xs)
+ stripWhiteSpace :: String -> String
+ stripWhiteSpace [] = []
+ stripWhiteSpace (x:xs)
+ | x `elem` " \t\n" = stripWhiteSpace xs
+ | otherwise = x : stripWhiteSpace xs
hunk ./Rakka/Wiki/Engine.hs 171
-formatSubPage :: (ArrowXml a, ArrowChoice a, ArrowIO a) =>
+makeMainXHTML :: (ArrowXml a, ArrowChoice a, ArrowIO a) =>
hunk ./Rakka/Wiki/Engine.hs 175
- -> a (PageName, (Maybe Page, Page)) XmlTree
-formatSubPage sto sysConf interpTable
- = proc (mainPageName, (mainPage, subPage))
+ -> a XmlTree XmlTree
+makeMainXHTML sto sysConf interpTable
+ = proc tree
+ -> do BaseURI baseURI <- getSysConfA sysConf -< ()
+ wiki <- wikifyPage interpTable -< tree
+ pName <- getXPathTreesInDoc "/page/@name/text()" >>> getText -< tree
+ interpreted <- interpretCommands sto sysConf interpTable
+ -< (pName, Just (tree, wiki), wiki)
+ formatWikiBlocks -< (baseURI, interpreted)
+
+
+makeSubXHTML :: (ArrowXml a, ArrowChoice a, ArrowIO a) =>
+ Storage
+ -> SystemConfig
+ -> InterpTable
+ -> a (PageName, Maybe XmlTree, XmlTree) XmlTree
+makeSubXHTML sto sysConf interpTable
+ = proc (mainPageName, mainPage, subPage)
hunk ./Rakka/Wiki/Engine.hs 196
- -> do wiki <- arr2 wikifyPage -< (interpTable, page)
+ -> do wiki <- wikifyPage interpTable -< page
hunk ./Rakka/Wiki/Engine.hs 200
- subWiki <- arr2 wikifyPage -< (interpTable, subPage)
- xs <- interpretCommandsA sto sysConf interpTable
- -< (mainPageName, mainWiki, subWiki)
- formatWikiBlocks -< (baseURI, xs)
-
-
-wikifyPage :: InterpTable -> Page -> WikiPage
-wikifyPage interpTable page
- = case pageType page of
- MIMEType "text" "x-rakka" _
- -> let source = decodeLazy UTF8 (pageContent page)
- parser = wikiPage tableToFunc
- in
- case parse parser "" source of
- Left err -> wikifyParseError err
- Right xs -> xs
-
- MIMEType "image" _ _
- -> [ Paragraph [ Image (pageName page) Nothing ] ]
-
- _ -> if pageIsBinary page then
- -- object へのリンクのみ
- [ Paragraph [ ObjectLink (pageName page) (Just $ pageFileName' page) ] ]
- else
- -- pre
- let text = decodeLazy UTF8 (pageContent page)
- in
- [ Preformatted [ Text text ] ]
- where
- tableToFunc :: String -> Maybe CommandType
- tableToFunc name
- = fmap commandType (M.lookup name interpTable)
-
+ subWiki <- wikifyPage interpTable -< subPage
+ interpreted <- interpretCommands sto sysConf interpTable
+ -< (mainPageName, mainWiki, subWiki)
+ formatWikiBlocks -< (baseURI, interpreted)
hunk ./Rakka/Wiki/Engine.hs 205
-interpretCommandsA :: (ArrowIO a, ArrowApply a) =>
- Storage
- -> SystemConfig
- -> InterpTable
- -> a (PageName, Maybe (Page, WikiPage), WikiPage) WikiPage
-interpretCommandsA sto sysConf interpTable
- = proc (name, mainPageAndTree, targetTree)
- -> arrIO0 (interpretCommands sto sysConf interpTable name mainPageAndTree targetTree)
- -<< ()
hunk ./Rakka/Wiki/Engine.hs 206
-
-interpretCommands :: Storage
+interpretCommands :: (ArrowXml a, ArrowChoice a, ArrowIO a) =>
+ Storage
hunk ./Rakka/Wiki/Engine.hs 210
- -> PageName
- -> Maybe (Page, WikiPage)
- -> WikiPage
- -> IO WikiPage
-interpretCommands sto sysConf interpTable name mainPageAndTree targetTree
- = everywhereM' (mkM interpBlockCmd) targetTree
- >>=
- everywhereM' (mkM interpInlineCmd)
+ -> a (PageName, Maybe (XmlTree, WikiPage), WikiPage) WikiPage
+interpretCommands sto sysConf interpTable
+ = proc (name, mainPageAndWiki, targetWiki)
+ -> let ctx = InterpreterContext {
+ ctxPageName = name
+ , ctxMainPage = fmap fst mainPageAndWiki
+ , ctxMainWiki = fmap snd mainPageAndWiki
+ , ctxTargetWiki = targetWiki
+ , ctxStorage = sto
+ , ctxSysConf = sysConf
+ }
+ in
+ ( arrIO (everywhereM' (mkM $ interpBlockCmd ctx))
+ >>>
+ arrIO (everywhereM' (mkM $ interpInlineCmd ctx))
+ ) -<< targetWiki
hunk ./Rakka/Wiki/Engine.hs 227
- ctx :: InterpreterContext
- ctx = InterpreterContext {
- ctxPageName = name
- , ctxMainPage = fmap fst mainPageAndTree
- , ctxMainTree = fmap snd mainPageAndTree
- , ctxTargetTree = targetTree
- , ctxStorage = sto
- , ctxSysConf = sysConf
- }
+ interpBlockCmd :: InterpreterContext -> BlockElement -> IO BlockElement
+ interpBlockCmd ctx (BlockCmd cmd) = interpBlockCmd' ctx cmd
+ interpBlockCmd _ others = return others
hunk ./Rakka/Wiki/Engine.hs 231
- interpBlockCmd :: BlockElement -> IO BlockElement
- interpBlockCmd (BlockCmd cmd) = interpBlockCmd' cmd
- interpBlockCmd others = return others
-
- interpBlockCmd' :: BlockCommand -> IO BlockElement
- interpBlockCmd' cmd
+ interpBlockCmd' :: InterpreterContext -> BlockCommand -> IO BlockElement
+ interpBlockCmd' ctx cmd
hunk ./Rakka/Wiki/Engine.hs 241
- interpInlineCmd :: InlineElement -> IO InlineElement
- interpInlineCmd (InlineCmd cmd) = interpInlineCmd' cmd
- interpInlineCmd others = return others
+ interpInlineCmd :: InterpreterContext -> InlineElement -> IO InlineElement
+ interpInlineCmd ctx (InlineCmd cmd) = interpInlineCmd' ctx cmd
+ interpInlineCmd _ others = return others
hunk ./Rakka/Wiki/Engine.hs 245
- interpInlineCmd' :: InlineCommand -> IO InlineElement
- interpInlineCmd' cmd
+ interpInlineCmd' :: InterpreterContext -> InlineCommand -> IO InlineElement
+ interpInlineCmd' ctx cmd
hunk ./Rakka/Wiki/Engine.hs 255
-makeDraft :: InterpTable -> Page -> IO Document
-makeDraft interpTable page
- = do doc <- newDocument
+makeDraft :: (ArrowXml a, ArrowChoice a, ArrowIO a) => InterpTable -> a XmlTree Document
+makeDraft interpTable
+ = proc tree ->
+ do doc <- arrIO0 newDocument -< ()
+
+ pName <- getXPathTreesInDoc "/page/@name/text()" >>> getText -< tree
+ pType <- getXPathTreesInDoc "/page/@type/text()" >>> getText -< tree
+ pLastMod <- getXPathTreesInDoc "/page/@lastModified/text()" >>> getText -< tree
+ pIsLocked <- getXPathTreesInDoc "/page/@isLocked/text()" >>> getText -< tree
+ pIsBoring <- getXPathTreesInDoc "/page/@isBoring/text()" >>> getText -< tree
+ pIsBinary <- getXPathTreesInDoc "/page/@isBinary/text()" >>> getText -< tree
+ pRevision <- getXPathTreesInDoc "/page/@revision/text()" >>> getText -< tree
+ pLang <- maybeA (getXPathTreesInDoc "/page/@lang/text()" >>> getText) -< tree
+ pFileName <- maybeA (getXPathTreesInDoc "/page/@fileName/text()" >>> getText) -< tree
+ pIsTheme <- maybeA (getXPathTreesInDoc "/page/@isTheme/text()" >>> getText) -< tree
+ pIsFeed <- maybeA (getXPathTreesInDoc "/page/@isFeed/text()" >>> getText) -< tree
+ pSummary <- maybeA (getXPathTreesInDoc "/page/summary/text()" >>> getText) -< tree
hunk ./Rakka/Wiki/Engine.hs 273
- setURI doc $ Just $ mkRakkaURI $ pageName page
- setAttribute doc "@title" $ Just $ pageName page
- setAttribute doc "@lang" $ pageLanguage page
- setAttribute doc "@type" $ Just $ show $ pageType page
- setAttribute doc "@mdate" $ Just $ formatW3CDateTime $ pageLastMod page
- setAttribute doc "rakka:fileName" $ pageFileName page
- setAttribute doc "rakka:isLocked" $ Just $ yesOrNo $ pageIsLocked page
- setAttribute doc "rakka:isBoring" $ Just $ yesOrNo $ pageIsBoring page
- setAttribute doc "rakka:isBinary" $ Just $ yesOrNo $ pageIsBinary page
- setAttribute doc "rakka:revision" $ Just $ show $ pageRevision page
- setAttribute doc "rakka:summary" $ pageSummary page
+ arrIO2 setURI -< (doc, Just $ mkRakkaURI pName)
+ arrIO2 (flip setAttribute "@title" ) -< (doc, Just pName)
+ arrIO2 (flip setAttribute "@type" ) -< (doc, Just pType)
+ arrIO2 (flip setAttribute "@mdate" ) -< (doc, Just pLastMod)
+ arrIO2 (flip setAttribute "@lang" ) -< (doc, pLang)
+ arrIO2 (flip setAttribute "rakka:fileName") -< (doc, pFileName)
+ arrIO2 (flip setAttribute "rakka:isLocked") -< (doc, Just pIsLocked)
+ arrIO2 (flip setAttribute "rakka:isBoring") -< (doc, Just pIsBoring)
+ arrIO2 (flip setAttribute "rakka:isBinary") -< (doc, Just pIsBinary)
+ arrIO2 (flip setAttribute "rakka:revision") -< (doc, Just pRevision)
+ arrIO2 (flip setAttribute "rakka:summary" ) -< (doc, pSummary)
hunk ./Rakka/Wiki/Engine.hs 285
- addHiddenText doc (pageName page)
+ arrIO2 addHiddenText -< (doc, pName)
hunk ./Rakka/Wiki/Engine.hs 287
- case pageType page of
- MIMEType "text" "css" _
- -> setAttribute doc "rakka:isTheme" $ Just $ yesOrNo $ pageIsTheme page
- MIMEType "text" "x-rakka" _
- -> setAttribute doc "rakka:isFeed" $ Just $ yesOrNo $ pageIsFeed page
- _ -> return ()
-
- case pageSummary page of
- Nothing -> return ()
- Just s -> addHiddenText doc s
+ case pSummary of
+ Just s -> arrIO2 addHiddenText -< (doc, s)
+ Nothing -> returnA -< ()
hunk ./Rakka/Wiki/Engine.hs 292
- sequence_ [ addHiddenText doc x
- | (_, x) <- M.toList (pageOtherLang page) ]
+ otherLangs <- listA (getXPathTreesInDoc "/page/otherLang/link/@page/text()" >>> getText) -< tree
+ listA ( (arr fst &&& arrL snd)
+ >>>
+ arrIO2 addHiddenText
+ >>>
+ none
+ ) -< (doc, otherLangs)
+
+ case read pType of
+ MIMEType "text" "css" _
+ -> arrIO2 (flip setAttribute "rakka:isTheme") -< (doc, pIsTheme)
+
+ MIMEType "text" "x-rakka" _
+ -- wikify して興味のある部分を addText する。
+ -> do arrIO2 (flip setAttribute "rakka:isFeed") -< (doc, pIsFeed)
+ wikiPage <- wikifyPage interpTable -< tree
+ arrIO0 (everywhereM' (mkM (addBlockText doc)) wikiPage) -<< ()
+ arrIO0 (everywhereM' (mkM (addInlineText doc)) wikiPage) -<< ()
+ returnA -< ()
hunk ./Rakka/Wiki/Engine.hs 312
- -- wikify して興味のある部分を addText する。
- let wikiPage = wikifyPage interpTable page
- everywhereM' (mkM (addBlockText doc)) wikiPage
- everywhereM' (mkM (addInlineText doc)) wikiPage
+ MIMEType _ _ _
+ -> returnA -< ()
hunk ./Rakka/Wiki/Engine.hs 315
- return doc
+ returnA -< doc
hunk ./Rakka/Wiki/Engine.hs 350
-
hunk ./Rakka/Wiki/Engine.hs 355
-wikifyParseError :: ParseError -> WikiPage
-wikifyParseError err
- = [Div [("class", "error")]
- [ Block (Preformatted [Text (show err)]) ]]
+wikifyParseError :: Arrow a => a ParseError WikiPage
+wikifyParseError = proc err
+ -> returnA -< [Div [("class", "error")]
+ [ Block (Preformatted [Text (show err)]) ]]
hunk ./Rakka/Wiki/Formatter.hs 8
-import Control.Arrow.ArrowTree
hunk ./Rakka/Wiki/Formatter.hs 23
- attachXHtmlNs -< tree
+ returnA -< tree
hunk ./Rakka/Wiki/Formatter.hs 243
-formatImage = proc (baseURI, Image name alt)
- -> let uri = mkObjectURI baseURI name
+formatImage = proc (baseURI, Image src alt)
+ -> let uri = mkObjectURI baseURI src
hunk ./Rakka/Wiki/Formatter.hs 270
-
-attachXHtmlNs :: ArrowXml a => a XmlTree XmlTree
-attachXHtmlNs = processBottomUp (changeQName attach')
- where
- attach' :: QName -> QName
- attach' qn = qn {
- namePrefix = "xhtml"
- , namespaceUri = "http://www.w3.org/1999/xhtml"
- }
-
hunk ./Rakka/Wiki/Interpreter.hs 14
+import Text.XML.HXT.DOM.TypeDefs
hunk ./Rakka/Wiki/Interpreter.hs 31
- , ctxMainPage :: !(Maybe Page)
- , ctxMainTree :: !(Maybe WikiPage)
- , ctxTargetTree :: !WikiPage
+ , ctxMainPage :: !(Maybe XmlTree)
+ , ctxMainWiki :: !(Maybe WikiPage)
+ , ctxTargetWiki :: !WikiPage
hunk ./Rakka/Wiki/Interpreter/Base.hs 6
+import Control.Arrow
+import Control.Arrow.ListArrow
hunk ./Rakka/Wiki/Interpreter/Base.hs 16
+import Text.XML.HXT.Arrow.XmlArrow
+import Text.XML.HXT.Arrow.XmlNodeSet
hunk ./Rakka/Wiki/Interpreter/Base.hs 69
- 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
+ xs -> do Languages langTable <- getSysConf (ctxSysConf ctx)
+ let merged = mergeTables langTable linkTable
+ return $ mkLangList merged
hunk ./Rakka/Wiki/Interpreter/Outline.hs 20
- case ctxMainTree ctx of
+ case ctxMainWiki ctx of
hunk ./schemas/rakka-page-1.0.rng 27
-
-
-
-
-
-
}