fixed the compilation breakage with newer HXT

darcs-hash:20080618090100-62b54-ca69b03247eba0313ee45ae89ecace0533c37321.gz

diff --git a/Rakka.cabal b/Rakka.cabal
index 7f2cef3173c15303139f5bb300154f7f02392a46..20efd880f75917b498f033c4b886c68c9945de6e 100644 (file)
--- a/Rakka.cabal
+++ b/Rakka.cabal
@@ -5,8 +5,8 @@ Description:
     similar to MediaWiki.
 Version:       0.1
 License:       PublicDomain
     similar to MediaWiki.
 Version:       0.1
 License:       PublicDomain

-Author:        PHO <phonohawk at ps dot sakura dot ne dot jp>
-Maintainer:    PHO <phonohawk at ps dot sakura dot ne dot jp>
+Author:        PHO <pho at cielonegro dot org>
+Maintainer:    PHO <pho at cielonegro dot org>

 Stability:     experimental
 Homepage:      http://rakka.cielonegro.org/
 Category:      Web
 Stability:     experimental
 Homepage:      http://rakka.cielonegro.org/
 Category:      Web

diff --git a/Rakka/Page.hs b/Rakka/Page.hs
index 114e2d09db163e1be1f6effa69c7736fad34107d..4dd5fcf246300e5e0172fe7db987c7156b8e4fac 100644 (file)
--- a/Rakka/Page.hs
+++ b/Rakka/Page.hs
@@ -29,9 +29,6 @@ module Rakka.Page
     where
 
 import qualified Codec.Binary.UTF8.String as UTF8
     where
 
 import qualified Codec.Binary.UTF8.String as UTF8

-import           Control.Arrow
-import           Control.Arrow.ArrowIO
-import           Control.Arrow.ArrowList

 import qualified Data.ByteString.Lazy as Lazy (ByteString)
 import qualified Data.ByteString.Lazy as L hiding (ByteString)
 import qualified Data.ByteString.Lazy.Char8 as L8 hiding (ByteString)
 import qualified Data.ByteString.Lazy as Lazy (ByteString)
 import qualified Data.ByteString.Lazy as L hiding (ByteString)
 import qualified Data.ByteString.Lazy.Char8 as L8 hiding (ByteString)


@@ -47,8 +44,7 @@ import           Rakka.Utils
 import           Rakka.W3CDateTime
 import           Subversion.Types
 import           System.FilePath.Posix
 import           Rakka.W3CDateTime
 import           Subversion.Types
 import           System.FilePath.Posix

-import           Text.XML.HXT.Arrow.XmlArrow
-import           Text.XML.HXT.Arrow.XmlNodeSet
+import           Text.XML.HXT.Arrow

 import           Text.XML.HXT.DOM.TypeDefs
 
 
 import           Text.XML.HXT.DOM.TypeDefs
 
 


@@ -393,4 +389,4 @@ parseUpdateInfo
                       , uiOldName     = oldName
                       }
 
                       , uiOldName     = oldName
                       }
 

-      
\ No newline at end of file
+      

diff --git a/Rakka/Resource/PageEntity.hs b/Rakka/Resource/PageEntity.hs
index 3ff0bba4a9ff9529926f464cd587bf5a8779f3b1..670958e80c6d4b2ecf31c82f640e19f34eabc9ff 100644 (file)
--- a/Rakka/Resource/PageEntity.hs
+++ b/Rakka/Resource/PageEntity.hs
@@ -3,10 +3,6 @@ module Rakka.Resource.PageEntity
     )
     where
 
     )
     where
 

-import           Control.Arrow
-import           Control.Arrow.ArrowIO
-import           Control.Arrow.ArrowIf
-import           Control.Arrow.ArrowList

 import           Control.Monad.Trans
 import           Data.Char
 import qualified Data.Map as M
 import           Control.Monad.Trans
 import           Data.Char
 import qualified Data.Map as M


@@ -25,11 +21,7 @@ import           Rakka.W3CDateTime
 import           Rakka.Wiki.Engine
 import           System.FilePath
 import           Text.HyperEstraier hiding (getText)
 import           Rakka.Wiki.Engine
 import           System.FilePath
 import           Text.HyperEstraier hiding (getText)

-import           Text.XML.HXT.Arrow.Namespace
-import           Text.XML.HXT.Arrow.WriteDocument
-import           Text.XML.HXT.Arrow.XmlArrow
-import           Text.XML.HXT.Arrow.XmlIOStateArrow
-import           Text.XML.HXT.Arrow.XmlNodeSet
+import           Text.XML.HXT.Arrow

 import           Text.XML.HXT.DOM.TypeDefs
 import           Text.XML.HXT.DOM.XmlKeywords
 
 import           Text.XML.HXT.DOM.TypeDefs
 import           Text.XML.HXT.DOM.XmlKeywords
 


@@ -582,4 +574,4 @@ findFeeds sto
 
 mkFeedURIStr :: URI -> PageName -> String
 mkFeedURIStr baseURI name
 
 mkFeedURIStr :: URI -> PageName -> String
 mkFeedURIStr baseURI name

-    = uriToString id (mkFeedURI baseURI name) ""
\ No newline at end of file
+    = uriToString id (mkFeedURI baseURI name) ""

diff --git a/Rakka/Resource/Search.hs b/Rakka/Resource/Search.hs
index c46d40152c34f4ab25e8c43f8e2afe8c9af81e07..7318e30b34845b9bb01aa4ef65fd8b38cd86976d 100644 (file)
--- a/Rakka/Resource/Search.hs
+++ b/Rakka/Resource/Search.hs
@@ -4,11 +4,6 @@ module Rakka.Resource.Search
     where
 
 import qualified Codec.Binary.UTF8.String as UTF8
     where
 
 import qualified Codec.Binary.UTF8.String as UTF8

-import           Control.Arrow
-import           Control.Arrow.ArrowIO
-import           Control.Arrow.ArrowIf
-import           Control.Arrow.ArrowList
-import           Control.Arrow.ArrowTree

 import           Control.Monad.Trans
 import           Data.Maybe
 import           Data.Time
 import           Control.Monad.Trans
 import           Data.Maybe
 import           Data.Time


@@ -25,9 +20,7 @@ import           Rakka.W3CDateTime
 import           Rakka.Wiki.Engine
 import           System.FilePath
 import           Text.HyperEstraier hiding (getText)
 import           Rakka.Wiki.Engine
 import           System.FilePath
 import           Text.HyperEstraier hiding (getText)

-import           Text.XML.HXT.Arrow.Namespace
-import           Text.XML.HXT.Arrow.XmlArrow
-import           Text.XML.HXT.Arrow.XmlNodeSet
+import           Text.XML.HXT.Arrow

 import           Text.XML.HXT.DOM.TypeDefs
 
 
 import           Text.XML.HXT.DOM.TypeDefs
 
 

diff --git a/Rakka/TrackBack.hs b/Rakka/TrackBack.hs
index 4155e3449af548e5a0013a25f8127b10adaf87f8..8b1d2cbba8f1a614e628ad3f8129de05d7b114eb 100644 (file)
--- a/Rakka/TrackBack.hs
+++ b/Rakka/TrackBack.hs
@@ -3,17 +3,13 @@ module Rakka.TrackBack
     )
     where
 
     )
     where
 

-import           Control.Arrow
-import           Control.Arrow.ArrowList
-import           Control.Arrow.ArrowTree

 import           Data.Maybe
 import           Data.Time
 import           Network.URI
 import           Rakka.Attachment
 import           Rakka.Utils
 import           Rakka.W3CDateTime
 import           Data.Maybe
 import           Data.Time
 import           Network.URI
 import           Rakka.Attachment
 import           Rakka.Utils
 import           Rakka.W3CDateTime

-import           Text.XML.HXT.Arrow.XmlArrow
-import           Text.XML.HXT.Arrow.XmlNodeSet
+import           Text.XML.HXT.Arrow

 import           Text.XML.HXT.DOM.TypeDefs
 
 
 import           Text.XML.HXT.DOM.TypeDefs
 
 


@@ -97,4 +93,4 @@ instance Attachment [TrackBack] where
                                 , tbURL      = url
                                 , tbBlogName = blogName
                                 , tbTime     = time
                                 , tbURL      = url
                                 , tbBlogName = blogName
                                 , tbTime     = time

-                                }
\ No newline at end of file
+                                }

diff --git a/Rakka/Wiki/Engine.hs b/Rakka/Wiki/Engine.hs
index dc3d4f14149f0b3e70f91f7e8a5f0b19dceb4d61..e135f15fa77591b06ce7bda94339c3504f445edd 100644 (file)
--- a/Rakka/Wiki/Engine.hs
+++ b/Rakka/Wiki/Engine.hs
@@ -9,9 +9,6 @@ module Rakka.Wiki.Engine
     where
 
 import qualified Codec.Binary.UTF8.String as UTF8
     where
 
 import qualified Codec.Binary.UTF8.String as UTF8

-import           Control.Arrow
-import           Control.Arrow.ArrowIO
-import           Control.Arrow.ArrowList

 import qualified Data.ByteString.Lazy as Lazy
 import qualified Data.ByteString.Lazy.Char8 as L8 hiding (ByteString)
 import           Data.Map (Map)
 import qualified Data.ByteString.Lazy as Lazy
 import qualified Data.ByteString.Lazy.Char8 as L8 hiding (ByteString)
 import           Data.Map (Map)


@@ -30,8 +27,7 @@ import           Rakka.Wiki.Formatter
 import           Rakka.Wiki.Interpreter
 import           Text.HyperEstraier hiding (getText)
 import           Text.ParserCombinators.Parsec
 import           Rakka.Wiki.Interpreter
 import           Text.HyperEstraier hiding (getText)
 import           Text.ParserCombinators.Parsec

-import           Text.XML.HXT.Arrow.XmlArrow hiding (err)
-import           Text.XML.HXT.Arrow.XmlNodeSet
+import           Text.XML.HXT.Arrow hiding (err)

 import           Text.XML.HXT.DOM.TypeDefs
 
 
 import           Text.XML.HXT.DOM.TypeDefs
 
 

diff --git a/Rakka/Wiki/Interpreter/Base.hs b/Rakka/Wiki/Interpreter/Base.hs
index b17af3253c1b7031046210d5cd465a67b8467b4b..2363b9b5da362bdee29c2433f8ff9b3b21a9361e 100644 (file)
--- a/Rakka/Wiki/Interpreter/Base.hs
+++ b/Rakka/Wiki/Interpreter/Base.hs
@@ -3,8 +3,6 @@ module Rakka.Wiki.Interpreter.Base
     )
     where
 
     )
     where
 

-import           Control.Arrow
-import           Control.Arrow.ListArrow

 import           Data.Map (Map)
 import qualified Data.Map as M
 import           Data.Maybe
 import           Data.Map (Map)
 import qualified Data.Map as M
 import           Data.Maybe


@@ -12,8 +10,7 @@ import           Rakka.Page
 import           Rakka.SystemConfig
 import           Rakka.Wiki
 import           Rakka.Wiki.Interpreter
 import           Rakka.SystemConfig
 import           Rakka.Wiki
 import           Rakka.Wiki.Interpreter

-import           Text.XML.HXT.Arrow.XmlArrow
-import           Text.XML.HXT.Arrow.XmlNodeSet
+import           Text.XML.HXT.Arrow

 
 
 interpreters :: [Interpreter]
 
 
 interpreters :: [Interpreter]


@@ -176,4 +173,4 @@ searchFieldInterp
                         ]
             in
               return (Input attrs)
                         ]
             in
               return (Input attrs)

-      }
\ No newline at end of file
+      }

diff --git a/schemas/rakka-page-1.0.rng b/schemas/rakka-page-1.0.rng
index e3ff797bafa7cc3ba906a2e1de7fbee47ef84469..27d3cfa8dbd9b0a556aa3d5f74cd2f4cffc775e6 100644 (file)
--- a/schemas/rakka-page-1.0.rng
+++ b/schemas/rakka-page-1.0.rng
@@ -11,6 +11,7 @@
           <attribute name="oldRevision">
             <data type="decimal">
               <param name="minInclusive">0</param>
           <attribute name="oldRevision">
             <data type="decimal">
               <param name="minInclusive">0</param>

+              <param name="fractionDigits">0</param>

             </data>
           </attribute>
 
             </data>
           </attribute>