import qualified Data.Set as S
import Network.HTTP.Lucu
import Network.URI
+import Prelude hiding (words)
import Rakka.Attachment
import Rakka.Page
import Rakka.Storage.DefaultPage
import System.Directory
import System.FilePath
import System.IO
+import System.IO.Unsafe
import System.Log.Logger
import Text.HyperEstraier hiding (WriteLock)
mapM_ (updateIndex index repos mkDraft newRev) (S.toList pages)
-searchIndex :: Database -> Condition -> IO [(PageName, RevNum)]
+searchIndex :: Database -> Condition -> IO [SearchResult]
searchIndex index cond
- = searchDatabase index cond >>= mapM fromId
+ = do (ids, hint) <- searchDatabase' index cond
+ mapM (fromId $ map fst hint) ids
where
- fromId :: DocumentID -> IO (PageName, RevNum)
- fromId docId
- = do uri <- getDocURI index docId
- rev <- getDocAttr index docId "rakka:revision"
- >>= return . read . fromJust
- return (decodePageName $ uriPath uri, rev)
+ fromId :: [String] -> DocumentID -> IO SearchResult
+ fromId words docId
+ = do uri <- getDocURI index docId
+ rev <- getDocAttr index docId "rakka:revision"
+ >>= return . read . fromJust
+ snippet <- unsafeInterleaveIO $
+ do doc <- getDocument index docId [NoAttributes, NoKeywords]
+ sn <- makeSnippet doc words 300 80 80
+ return (map toFragment sn)
+ return SearchResult {
+ srPageName = decodePageName $ uriPath uri
+ , srPageRev = rev
+ , srSnippet = snippet
+ }
+
+ toFragment :: Either String (String, String) -> SnippetFragment
+ toFragment (Left t) = NormalText t
+ toFragment (Right (w, _)) = HighlightedWord w
updateIndex :: Database