fixed search result titles and context

1 files changed, 11 insertions, 14 deletions

diff --git a/sphinx/builders/websupport.py b/sphinx/builders/websupport.py
index 8972c5479..19b084628 100644
--- a/sphinx/builders/websupport.py
+++ b/sphinx/builders/websupport.py
@@ -23,31 +23,25 @@ class WebSupportBuilder(StandaloneHTMLBuilder):
     name = 'websupport'
     out_suffix = '.fpickle'
 
-    def init(self):
-        self.init_search()
-        StandaloneHTMLBuilder.init(self)
-
-    def init_search(self):
-        self.search = self.app.search
-        if self.search is not None:
-            self.search.create_index()
-
     def init_translator_class(self):
         self.translator_class = WebSupportTranslator
         
     def write_doc(self, docname, doctree):
         # The translator needs the docname to generate ids.
         self.docname = docname
-        # Index the page if search is enabled.
-        if self.search is not None:
-            doc_contents = doctree.astext()
-            title = doc_contents[:20]
-            self.search.add_document(docname, title, doc_contents) 
         StandaloneHTMLBuilder.write_doc(self, docname, doctree)
 
     def get_target_uri(self, docname, typ=None):
         return docname
 
+    def load_indexer(self, docnames):
+        keep = set(self.env.all_docs) - set(docnames)
+        self.indexer = self.app.search
+        if self.indexer is not None:
+            self.indexer.create_index()
+        # delete all entries for files that will be rebuilt
+        self.indexer.prune(keep)
+
     def handle_page(self, pagename, addctx, templatename='page.html',
                     outfilename=None, event_arg=None):
         # This is mostly copied from StandaloneHTMLBuilder. However, instead
@@ -101,3 +95,6 @@ class WebSupportBuilder(StandaloneHTMLBuilder):
                                     os_path(ctx['sourcename']))
             ensuredir(path.dirname(source_name))
             copyfile(self.env.doc2path(pagename), source_name)
+
+    def dump_search_index(self):
+        pass