From bc8616eec0bcac3102860c76f93ebfd0da24c2d6 Mon Sep 17 00:00:00 2001 From: pho Date: Thu, 10 Jan 2008 17:59:13 +0900 Subject: [PATCH] dropped the concept of boring flag darcs-hash:20080110085913-62b54-d72942621233b326620ea6ca0eb5ac01da59ba61.gz --- Rakka/Page.hs | 9 ++------- Rakka/Storage/Repos.hs | 3 --- Rakka/Wiki/Engine.hs | 2 -- Rakka/Wiki/Interpreter/PageList.hs | 1 - defaultPages/Help/SampleImage/Large.xml | 3 +-- defaultPages/Help/SampleImage/Small.xml | 3 +-- defaultPages/Help/Syntax.xml | 1 - defaultPages/MainPage.xml | 1 - defaultPages/PageTitle.xml | 3 +-- defaultPages/SideBar/Left.xml | 3 +-- defaultPages/SideBar/Right.xml | 3 +-- defaultPages/StyleSheet/Default.xml | 1 - schemas/rakka-page-1.0.rng | 10 ---------- 13 files changed, 7 insertions(+), 36 deletions(-) diff --git a/Rakka/Page.hs b/Rakka/Page.hs index c1d7211..0affbf5 100644 --- a/Rakka/Page.hs +++ b/Rakka/Page.hs @@ -71,7 +71,6 @@ data Page , entityIsTheme :: !Bool -- text/css 以外では無意味 , entityIsFeed :: !Bool -- text/x-rakka 以外では無意味 , entityIsLocked :: !Bool - , entityIsBoring :: !Bool , entityIsBinary :: !Bool , entityRevision :: RevNum , entityLastMod :: UTCTime @@ -97,8 +96,8 @@ isRedirect _ = False isEntity :: Page -> Bool -isEntity (Entity _ _ _ _ _ _ _ _ _ _ _ _ _ _) = True -isEntity _ = False +isEntity (Entity _ _ _ _ _ _ _ _ _ _ _ _ _) = True +isEntity _ = False pageName :: Page -> PageName @@ -265,7 +264,6 @@ xmlizePage -> none ) += sattr "isLocked" (yesOrNo $ entityIsLocked page) - += sattr "isBoring" (yesOrNo $ entityIsBoring page) += sattr "isBinary" (yesOrNo $ entityIsBinary page) += sattr "revision" (show $ entityRevision page) += sattr "lastModified" (formatW3CDateTime lastMod) @@ -325,8 +323,6 @@ parseEntity >>> parseYesOrNo) -< tree isLocked <- (withDefault (getXPathTreesInDoc "/page/@isLocked/text()" >>> getText) "no" >>> parseYesOrNo) -< tree - isBoring <- (withDefault (getXPathTreesInDoc "/page/@isBoring/text()" >>> getText) "no" - >>> parseYesOrNo) -< tree summary <- (maybeA (getXPathTreesInDoc "/page/summary/text()" >>> getText @@ -362,7 +358,6 @@ parseEntity , entityIsTheme = isTheme , entityIsFeed = isFeed , entityIsLocked = isLocked - , entityIsBoring = isBoring , entityIsBinary = isBinary , entityRevision = undefined , entityLastMod = undefined diff --git a/Rakka/Storage/Repos.hs b/Rakka/Storage/Repos.hs index 8e717ed..0c4e253 100644 --- a/Rakka/Storage/Repos.hs +++ b/Rakka/Storage/Repos.hs @@ -131,7 +131,6 @@ loadPageInRepository repos name rev , entityIsTheme = any ((== "rakka:isTheme") . fst) props , entityIsFeed = any ((== "rakka:isFeed") . fst) props , entityIsLocked = any ((== "rakka:isLocked") . fst) props - , entityIsBoring = any ((== "rakka:isBoring") . fst) props , entityIsBinary = case mimeType of MIMEType "text" _ _ -> any ((== "rakka:isBinary") . fst) props @@ -225,7 +224,6 @@ putPageIntoRepository repos page setNodeProp path "rakka:isTheme" Nothing setNodeProp path "rakka:isFeed" Nothing setNodeProp path "rakka:isLocked" Nothing - setNodeProp path "rakka:isBoring" Nothing setNodeProp path "rakka:isBinary" Nothing setNodeProp path "rakka:summary" Nothing setNodeProp path "rakka:otherLang" Nothing @@ -239,7 +237,6 @@ putPageIntoRepository repos page setNodeProp path "rakka:isTheme" (encodeFlag $ entityIsTheme page) setNodeProp path "rakka:isFeed" (encodeFlag $ entityIsFeed page) setNodeProp path "rakka:isLocked" (encodeFlag $ entityIsLocked page) - setNodeProp path "rakka:isBoring" (encodeFlag $ entityIsBoring page) setNodeProp path "rakka:isBinary" (encodeFlag $ entityIsBinary page) setNodeProp path "rakka:summary" (entitySummary page) setNodeProp path "rakka:otherLang" (let otherLang = entityOtherLang page diff --git a/Rakka/Wiki/Engine.hs b/Rakka/Wiki/Engine.hs index 72effb3..21bdad1 100644 --- a/Rakka/Wiki/Engine.hs +++ b/Rakka/Wiki/Engine.hs @@ -262,7 +262,6 @@ makeDraft interpTable 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 @@ -278,7 +277,6 @@ makeDraft interpTable 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) diff --git a/Rakka/Wiki/Interpreter/PageList.hs b/Rakka/Wiki/Interpreter/PageList.hs index 1b433b8..2815bda 100644 --- a/Rakka/Wiki/Interpreter/PageList.hs +++ b/Rakka/Wiki/Interpreter/PageList.hs @@ -40,7 +40,6 @@ recentUpdatesInterp cond <- newCondition setPhrase cond "[UVSET]" - addAttrCond cond "rakka:isBoring STREQ no" addAttrCond cond "rakka:summary STRNE" -- summary が空でない setOrder cond "@mdate NUMD" setMax cond items diff --git a/defaultPages/Help/SampleImage/Large.xml b/defaultPages/Help/SampleImage/Large.xml index cdb81bc..ca6a704 100644 --- a/defaultPages/Help/SampleImage/Large.xml +++ b/defaultPages/Help/SampleImage/Large.xml @@ -1,7 +1,6 @@ + type="image/jpeg"> /9j/4AAQSkZJRgABAQEAYABgAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD/2wBDABgREhUS diff --git a/defaultPages/Help/SampleImage/Small.xml b/defaultPages/Help/SampleImage/Small.xml index 8f4bdb5..0c9bee5 100644 --- a/defaultPages/Help/SampleImage/Small.xml +++ b/defaultPages/Help/SampleImage/Small.xml @@ -1,7 +1,6 @@ + type="image/jpeg"> /9j/4AAQSkZJRgABAQEAYABgAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD/2wBDAAUDBAQE diff --git a/defaultPages/Help/Syntax.xml b/defaultPages/Help/Syntax.xml index ed2b90c..7e44e5c 100644 --- a/defaultPages/Help/Syntax.xml +++ b/defaultPages/Help/Syntax.xml @@ -1,7 +1,6 @@ diff --git a/defaultPages/PageTitle.xml b/defaultPages/PageTitle.xml index 3bd94c3..4590013 100644 --- a/defaultPages/PageTitle.xml +++ b/defaultPages/PageTitle.xml @@ -1,7 +1,6 @@ + type="text/x-rakka"> ]]> diff --git a/defaultPages/SideBar/Left.xml b/defaultPages/SideBar/Left.xml index bce6b71..25c8760 100644 --- a/defaultPages/SideBar/Left.xml +++ b/defaultPages/SideBar/Left.xml @@ -1,7 +1,6 @@ + type="text/x-rakka"> diff --git a/defaultPages/SideBar/Right.xml b/defaultPages/SideBar/Right.xml index 41699d1..ea9531a 100644 --- a/defaultPages/SideBar/Right.xml +++ b/defaultPages/SideBar/Right.xml @@ -1,7 +1,6 @@ + type="text/x-rakka"> diff --git a/defaultPages/StyleSheet/Default.xml b/defaultPages/StyleSheet/Default.xml index 9ecbbce..d4f7fe5 100644 --- a/defaultPages/StyleSheet/Default.xml +++ b/defaultPages/StyleSheet/Default.xml @@ -1,7 +1,6 @@ /* global configuration *******************************************************/ diff --git a/schemas/rakka-page-1.0.rng b/schemas/rakka-page-1.0.rng index 6466040..5505166 100644 --- a/schemas/rakka-page-1.0.rng +++ b/schemas/rakka-page-1.0.rng @@ -78,16 +78,6 @@ - - - - - yes - no - - - - -- 2.40.0