dropped the concept of boring flag

darcs-hash:20080110085913-62b54-d72942621233b326620ea6ca0eb5ac01da59ba61.gz

diff --git a/Rakka/Page.hs b/Rakka/Page.hs
index c1d72119e348c1f7ca02dadd980cd1e440912f1c..0affbf52f3b700bceb02e38a1770ad0d19165981 100644 (file)
--- 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
       , entityIsTheme    :: !Bool     -- text/css 以外では無意味
       , entityIsFeed     :: !Bool     -- text/x-rakka 以外では無意味
       , entityIsLocked   :: !Bool

-      , entityIsBoring   :: !Bool

       , entityIsBinary   :: !Bool
       , entityRevision   :: RevNum
       , entityLastMod    :: UTCTime
       , entityIsBinary   :: !Bool
       , entityRevision   :: RevNum
       , entityLastMod    :: UTCTime


@@ -97,8 +96,8 @@ isRedirect _                       = False
 
 
 isEntity :: Page -> Bool
 
 
 isEntity :: Page -> Bool

-isEntity (Entity _ _ _ _ _ _ _ _ _ _ _ _ _ _) = True
-isEntity _                                    = False
+isEntity (Entity _ _ _ _ _ _ _ _ _ _ _ _ _) = True
+isEntity _                                  = False

 
 
 pageName :: Page -> PageName
 
 
 pageName :: Page -> PageName


@@ -265,7 +264,6 @@ xmlizePage
                                   -> none
                           )
                        += sattr "isLocked" (yesOrNo $ entityIsLocked page)
                                   -> 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)
                        += 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
                        >>> 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
 
           summary <- (maybeA (getXPathTreesInDoc "/page/summary/text()"
                               >>> getText


@@ -362,7 +358,6 @@ parseEntity
                       , entityIsTheme    = isTheme
                       , entityIsFeed     = isFeed
                       , entityIsLocked   = isLocked
                       , entityIsTheme    = isTheme
                       , entityIsFeed     = isFeed
                       , entityIsLocked   = isLocked

-                      , entityIsBoring   = isBoring

                       , entityIsBinary   = isBinary
                       , entityRevision   = undefined
                       , entityLastMod    = undefined
                       , entityIsBinary   = isBinary
                       , entityRevision   = undefined
                       , entityLastMod    = undefined

diff --git a/Rakka/Storage/Repos.hs b/Rakka/Storage/Repos.hs
index 8e717ed27ee7008ec764ebd3f0637c51071d00d6..0c4e2531eb17e572dbcdd3a50984f97b09e742d3 100644 (file)
--- 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
                           , 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
                           , 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: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
                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: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
                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 72effb3ed2414817ae7a4d09e6062082a657d06d..21bdad1a11a27ac2895cc6745d735aefef277f38 100644 (file)
--- 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
                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
                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 "@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)
                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 1b433b87faf486637d92fbaffce8aa1e2e075140..2815bda638878a098715b57dd82d11988b445aa4 100644 (file)
--- a/Rakka/Wiki/Interpreter/PageList.hs
+++ b/Rakka/Wiki/Interpreter/PageList.hs
@@ -40,7 +40,6 @@ recentUpdatesInterp
                 
                 cond <- newCondition
                 setPhrase   cond "[UVSET]"
                 
                 cond <- newCondition
                 setPhrase   cond "[UVSET]"

-                addAttrCond cond "rakka:isBoring STREQ no"

                 addAttrCond cond "rakka:summary STRNE" -- summary が空でない
                 setOrder    cond "@mdate NUMD"
                 setMax      cond items
                 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 cdb81bcb8a22cd3bcd79c09e8278a4ea562087ae..ca6a70413bc988d5ed4f1e5cee9b5a9f777a8b8a 100644 (file)
--- a/defaultPages/Help/SampleImage/Large.xml
+++ b/defaultPages/Help/SampleImage/Large.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <page xmlns="http://cielonegro.org/schema/Rakka/Page/1.0"
 <?xml version="1.0" encoding="UTF-8"?>
 <page xmlns="http://cielonegro.org/schema/Rakka/Page/1.0"

-      type="image/jpeg"
-      isBoring="yes">
+      type="image/jpeg">

 
   <binaryData>
     /9j/4AAQSkZJRgABAQEAYABgAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD/2wBDABgREhUS
 
   <binaryData>
     /9j/4AAQSkZJRgABAQEAYABgAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD/2wBDABgREhUS

diff --git a/defaultPages/Help/SampleImage/Small.xml b/defaultPages/Help/SampleImage/Small.xml
index 8f4bdb52d93810276b7dd1ec30d38460889dc91e..0c9bee54aef7629f7c92a0b5fa000ec9818c3ee2 100644 (file)
--- a/defaultPages/Help/SampleImage/Small.xml
+++ b/defaultPages/Help/SampleImage/Small.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <page xmlns="http://cielonegro.org/schema/Rakka/Page/1.0"
 <?xml version="1.0" encoding="UTF-8"?>
 <page xmlns="http://cielonegro.org/schema/Rakka/Page/1.0"

-      type="image/jpeg"
-      isBoring="yes">
+      type="image/jpeg">

 
   <binaryData>
     /9j/4AAQSkZJRgABAQEAYABgAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD/2wBDAAUDBAQE
 
   <binaryData>
     /9j/4AAQSkZJRgABAQEAYABgAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD/2wBDAAUDBAQE

diff --git a/defaultPages/Help/Syntax.xml b/defaultPages/Help/Syntax.xml
index ed2b90cdd2e3b2c61a780e7fcce2608579006a4e..7e44e5cf2a4a236f7fcfa1d2d17793bcbc3fc718 100644 (file)
--- a/defaultPages/Help/Syntax.xml
+++ b/defaultPages/Help/Syntax.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <page xmlns="http://cielonegro.org/schema/Rakka/Page/1.0"
       type="text/x-rakka"
 <?xml version="1.0" encoding="UTF-8"?>
 <page xmlns="http://cielonegro.org/schema/Rakka/Page/1.0"
       type="text/x-rakka"

-      isBoring="yes"

       lang="en">
 
   <textData><![CDATA[
       lang="en">
 
   <textData><![CDATA[

diff --git a/defaultPages/MainPage.xml b/defaultPages/MainPage.xml
index cdfb7d6f720233ffc6552921603115e5402bc242..4af6d4b72674e83816c35c60a3785f531b458307 100644 (file)
--- a/defaultPages/MainPage.xml
+++ b/defaultPages/MainPage.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <page xmlns="http://cielonegro.org/schema/Rakka/Page/1.0"
       type="text/x-rakka"
 <?xml version="1.0" encoding="UTF-8"?>
 <page xmlns="http://cielonegro.org/schema/Rakka/Page/1.0"
       type="text/x-rakka"

-      isBoring="yes"

       lang="en">
 
   <otherLang>
       lang="en">
 
   <otherLang>

diff --git a/defaultPages/PageTitle.xml b/defaultPages/PageTitle.xml
index 3bd94c35543f57283cee65d42bf084456cd37348..4590013008394a5aa01e8a6f3c8106f535e9a5ee 100644 (file)
--- a/defaultPages/PageTitle.xml
+++ b/defaultPages/PageTitle.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <page xmlns="http://cielonegro.org/schema/Rakka/Page/1.0"
 <?xml version="1.0" encoding="UTF-8"?>
 <page xmlns="http://cielonegro.org/schema/Rakka/Page/1.0"

-      type="text/x-rakka"
-      isBoring="yes">
+      type="text/x-rakka">

   <textData><![CDATA[
 <pageName />
 ]]></textData>
   <textData><![CDATA[
 <pageName />
 ]]></textData>

diff --git a/defaultPages/SideBar/Left.xml b/defaultPages/SideBar/Left.xml
index bce6b7152554dd36b42eaa1997dbb4ae7e1ef26a..25c87606214bb61a09c46ea5f8f83ad056f12663 100644 (file)
--- a/defaultPages/SideBar/Left.xml
+++ b/defaultPages/SideBar/Left.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <page xmlns="http://cielonegro.org/schema/Rakka/Page/1.0"
 <?xml version="1.0" encoding="UTF-8"?>
 <page xmlns="http://cielonegro.org/schema/Rakka/Page/1.0"

-      type="text/x-rakka"
-      isBoring="yes">
+      type="text/x-rakka">

   <textData><![CDATA[
 = Outline =
 <outline />
   <textData><![CDATA[
 = Outline =
 <outline />

diff --git a/defaultPages/SideBar/Right.xml b/defaultPages/SideBar/Right.xml
index 41699d1605238f155f772579142f6c3991f5d0f2..ea9531a4d81e2661acf48908e08c38208101d4d4 100644 (file)
--- a/defaultPages/SideBar/Right.xml
+++ b/defaultPages/SideBar/Right.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <page xmlns="http://cielonegro.org/schema/Rakka/Page/1.0"
 <?xml version="1.0" encoding="UTF-8"?>
 <page xmlns="http://cielonegro.org/schema/Rakka/Page/1.0"

-      type="text/x-rakka"
-      isBoring="yes">
+      type="text/x-rakka">

   <textData><![CDATA[
 = Control =
 * <newPage />
   <textData><![CDATA[
 = Control =
 * <newPage />

diff --git a/defaultPages/StyleSheet/Default.xml b/defaultPages/StyleSheet/Default.xml
index 9ecbbce64504243d72495e1e4c2072cd27d29188..d4f7fe5b50b7d196d0360437f52919502a0e069f 100644 (file)
--- a/defaultPages/StyleSheet/Default.xml
+++ b/defaultPages/StyleSheet/Default.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page xmlns="http://cielonegro.org/schema/Rakka/Page/1.0"
       type="text/css"
 <?xml version="1.0" encoding="utf-8"?>
 <page xmlns="http://cielonegro.org/schema/Rakka/Page/1.0"
       type="text/css"

-      isBoring="yes"

       isTheme="yes">
   <textData>
 /* global configuration *******************************************************/
       isTheme="yes">
   <textData>
 /* global configuration *******************************************************/

diff --git a/schemas/rakka-page-1.0.rng b/schemas/rakka-page-1.0.rng
index 64660404f2279ec5ea0fb5b4409165fc97898396..55051662502c1f67c148a4b5c82a43b9e2601d80 100644 (file)
--- a/schemas/rakka-page-1.0.rng
+++ b/schemas/rakka-page-1.0.rng
@@ -78,16 +78,6 @@
         </attribute>
       </optional>
 
         </attribute>
       </optional>
 

-      <optional>
-        <!-- 更新履歴や RSS から削除されるフラグ -->
-        <attribute name="isBoring">
-          <choice>
-            <value>yes</value>
-            <value>no</value>
-          </choice>
-        </attribute>
-      </optional>
-

       <interleave>
         <optional>
           <element name="summary">
       <interleave>
         <optional>
           <element name="summary">