merge branch origin/master

[Rakka.git] / Rakka / Storage.hs

diff --git a/Rakka/Storage.hs b/Rakka/Storage.hs
index d26f713d8f88140a361c13ea98d1e95ba9d38131..d67380855316e2bd655daf72c7161af8d57ae48d 100644 (file)
--- a/Rakka/Storage.hs
+++ b/Rakka/Storage.hs
@@ -1,6 +1,11 @@
 module Rakka.Storage
     ( Storage
 
+    -- re-export from Rakka.Storage.Types
+    , SearchResult(..) 
+    , HitPage(..)
+    , SnippetFragment(..)
+
     , mkStorage -- private
 
     , getPage
@@ -25,16 +30,13 @@ module Rakka.Storage
 
 import           Control.Arrow.ArrowIO
 import           Control.Concurrent.STM
-import           Control.Monad
 import           Control.Monad.Trans
-import           Data.Maybe
 import           Network.HTTP.Lucu
 import           Rakka.Attachment
 import           Rakka.Page
 import           Rakka.Storage.Impl
 import           Rakka.Storage.Types
 import           Subversion.Types
-import           System.IO
 import           Subversion.Repository
 import           Text.HyperEstraier hiding (WriteLock)
 
@@ -88,7 +90,7 @@ getDirContentsA :: ArrowIO a => Storage -> a (PageName, Maybe RevNum) [PageName]
 getDirContentsA = arrIO2 . getDirContents
 
 
-searchPages :: MonadIO m => Storage -> Condition -> m [(PageName, RevNum)]
+searchPages :: MonadIO m => Storage -> Condition -> m SearchResult
 searchPages sto cond
     = liftIO $
       do var <- newEmptyTMVarIO