X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FStorage.hs;h=d67380855316e2bd655daf72c7161af8d57ae48d;hb=72a6f7ad9e7d0bbf130f1ba12211571a6e2feb24;hp=03b8c54134c3a3316e03bb18c57c145b3583d831;hpb=e751af5e3d23d7757f363bf4e86f9d732d90be7f;p=Rakka.git diff --git a/Rakka/Storage.hs b/Rakka/Storage.hs index 03b8c54..d673808 100644 --- a/Rakka/Storage.hs +++ b/Rakka/Storage.hs @@ -3,6 +3,7 @@ module Rakka.Storage -- re-export from Rakka.Storage.Types , SearchResult(..) + , HitPage(..) , SnippetFragment(..) , mkStorage -- private @@ -29,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) @@ -92,7 +90,7 @@ getDirContentsA :: ArrowIO a => Storage -> a (PageName, Maybe RevNum) [PageName] getDirContentsA = arrIO2 . getDirContents -searchPages :: MonadIO m => Storage -> Condition -> m [SearchResult] +searchPages :: MonadIO m => Storage -> Condition -> m SearchResult searchPages sto cond = liftIO $ do var <- newEmptyTMVarIO