diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2016-12-17 15:59:13 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2016-12-17 15:59:13 +0900 |
| commit | ab00f5fe49f57d4ee8bc25127db9b12fbed4f54f (patch) | |
| tree | edb2d68140b3e920cfff7fe663019612ab47a1c7 /sphinx/websupport | |
| parent | b1e4036640b5d2290674e1a04f957f015d89f62d (diff) | |
| parent | 7b3327234dc1f4385c175d29c68be430bba4c8f5 (diff) | |
| download | sphinx-git-ab00f5fe49f57d4ee8bc25127db9b12fbed4f54f.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'sphinx/websupport')
| -rw-r--r-- | sphinx/websupport/search/xapiansearch.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sphinx/websupport/search/xapiansearch.py b/sphinx/websupport/search/xapiansearch.py index 1e43dcbe9..aa7cff86a 100644 --- a/sphinx/websupport/search/xapiansearch.py +++ b/sphinx/websupport/search/xapiansearch.py @@ -39,16 +39,16 @@ class XapianSearch(BaseSearch): # Ensure the db lock is removed. del self.database - def add_document(self, path, title, text): + def add_document(self, pagename, filename, title, text): self.database.begin_transaction() # sphinx_page_path is used to easily retrieve documents by path. - sphinx_page_path = '"sphinxpagepath%s"' % path.replace('/', '_') + sphinx_page_path = '"sphinxpagepath%s"' % pagename.replace('/', '_') # Delete the old document if it exists. self.database.delete_document(sphinx_page_path) doc = xapian.Document() doc.set_data(text) - doc.add_value(self.DOC_PATH, path) + doc.add_value(self.DOC_PATH, pagename) doc.add_value(self.DOC_TITLE, title) self.indexer.set_document(doc) self.indexer.index_text(text) |