Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add section linking for the search result #5829

Merged
merged 70 commits into from
Jul 12, 2019
Merged
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
ee1ba1a
add sections field
dojutsu-user Jun 19, 2019
4b05f8a
index each section as separate document in ES
dojutsu-user Jun 21, 2019
79d2459
Merge branch 'master' into search-section-linking
dojutsu-user Jun 21, 2019
54ceb5c
few refactoring
dojutsu-user Jun 21, 2019
b11e357
revert all
dojutsu-user Jun 24, 2019
5b81471
Merge branch 'master' into search-section-linking
dojutsu-user Jun 24, 2019
762a79d
update document mapping (nested fields)
dojutsu-user Jun 24, 2019
7a61dbd
format text
dojutsu-user Jun 24, 2019
644565b
get results from inner_hits
dojutsu-user Jun 25, 2019
fa51a1c
Merge branch 'master' into search-section-linking
dojutsu-user Jun 25, 2019
0bc6be5
correct the none
dojutsu-user Jun 25, 2019
0139993
add field for PageDocument.
dojutsu-user Jun 26, 2019
53a02e8
remove domain_index settings
dojutsu-user Jun 26, 2019
11ba9e7
Merge branch 'htmlfile-sphinx-domain-integration' into search-section…
dojutsu-user Jun 26, 2019
6207f4e
remove SphinxDomainDocument and DomainSearch
dojutsu-user Jun 26, 2019
a251a98
generate correct query
dojutsu-user Jun 26, 2019
b6847b9
remove boosting and allsearch
dojutsu-user Jun 26, 2019
af2d69f
remove allsearch import
dojutsu-user Jun 26, 2019
32d0bed
recursively remove newline characters from highlight dict
dojutsu-user Jun 26, 2019
d472f29
Merge branch 'master' into search-section-linking
dojutsu-user Jun 27, 2019
878343d
lint fix
dojutsu-user Jun 27, 2019
f98d91c
Merge branch 'master' into search-section-linking
dojutsu-user Jun 28, 2019
7c1c641
set number_of_fragments to 1
dojutsu-user Jun 28, 2019
fd8e8f7
use nested facet
dojutsu-user Jun 28, 2019
f6221ec
get sorted results
dojutsu-user Jul 2, 2019
8840606
Merge branch 'master' into search-section-linking
dojutsu-user Jul 2, 2019
60e229c
fix search.html
dojutsu-user Jul 2, 2019
3835e2e
remove unused imports and add logging
dojutsu-user Jul 2, 2019
ae5033c
show more data on domain objects
dojutsu-user Jul 3, 2019
28e7cbf
fix main site search
dojutsu-user Jul 3, 2019
1e2a40b
mark as safe and change log to debug
dojutsu-user Jul 3, 2019
7b7a3c9
add transpiled files -- js
dojutsu-user Jul 3, 2019
3931bc0
remove log
dojutsu-user Jul 3, 2019
84a2494
small improvements in template
dojutsu-user Jul 3, 2019
5cae508
change variable name
dojutsu-user Jul 3, 2019
adb74ed
fix template
dojutsu-user Jul 4, 2019
d500d98
fix lint
dojutsu-user Jul 4, 2019
9461d4f
use python datatypes
dojutsu-user Jul 4, 2019
75dcc2f
remove highlight url param from sections and domains
dojutsu-user Jul 4, 2019
ea36138
fix clashing css classes
dojutsu-user Jul 4, 2019
451c0f4
Merge branch 'master' into search-section-linking
dojutsu-user Jul 8, 2019
0817d43
use underscore.js template
dojutsu-user Jul 8, 2019
5305458
add _ with variables
dojutsu-user Jul 8, 2019
68cb7af
add comment in template
dojutsu-user Jul 8, 2019
d62bf3e
use .iterator()
dojutsu-user Jul 8, 2019
ed16e56
show multiple results per section, if present
dojutsu-user Jul 9, 2019
0ed64f7
fix sphinx indexing
dojutsu-user Jul 9, 2019
f988302
don't index '-' value of domain.display_name
dojutsu-user Jul 9, 2019
429b3e9
fix eslint
dojutsu-user Jul 9, 2019
897e09f
Merge branch 'master' into search-section-linking
dojutsu-user Jul 9, 2019
aeaba6f
reduce complexity in search.js
dojutsu-user Jul 10, 2019
6f9b2bc
refactor tasks.py file
dojutsu-user Jul 10, 2019
6135cde
fix logic in search.views
dojutsu-user Jul 10, 2019
d3566ac
make 100 a constant
dojutsu-user Jul 10, 2019
992c72e
Add checkbox for searching in current section
dojutsu-user Jul 10, 2019
f0babf1
remove checkbox code for now
dojutsu-user Jul 10, 2019
4527839
Merge branch 'master' into search-section-linking
dojutsu-user Jul 10, 2019
7e75d7e
fix test_imported_file
dojutsu-user Jul 10, 2019
1e6721d
fix test_search_json_parsing
dojutsu-user Jul 10, 2019
2a4c070
fix test_search_json_parsing
dojutsu-user Jul 10, 2019
4beec39
update test_search_json_parsing
dojutsu-user Jul 10, 2019
01346a0
Merge branch 'master' into search-section-linking
dojutsu-user Jul 11, 2019
91282de
refactor parse_json and its test
dojutsu-user Jul 11, 2019
cfe8f5b
write initial tests
dojutsu-user Jul 11, 2019
7e99f6a
make 100 as constant
dojutsu-user Jul 11, 2019
b7ce777
fix lint
dojutsu-user Jul 12, 2019
6701a4e
add test for domains and filter by version and project
dojutsu-user Jul 12, 2019
cee24ed
revert changes to python_environments.py
dojutsu-user Jul 12, 2019
685f6db
remove tests from this pr
dojutsu-user Jul 12, 2019
d7edeee
update template to make 100 as constant
dojutsu-user Jul 12, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use nested facet
dojutsu-user committed Jun 28, 2019
commit fd8e8f76cab1df977222b5c825f6864a2c6e8344
7 changes: 6 additions & 1 deletion readthedocs/search/faceted_search.py
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@

from elasticsearch import Elasticsearch
from elasticsearch_dsl import FacetedSearch, TermsFacet
from elasticsearch_dsl.faceted_search import NestedFacet
from elasticsearch_dsl.query import Bool, SimpleQueryString, Nested, Match

from django.conf import settings
@@ -91,7 +92,11 @@ class ProjectSearchBase(RTDFacetedSearch):
class PageSearchBase(RTDFacetedSearch):
facets = {
'project': TermsFacet(field='project'),
'version': TermsFacet(field='version')
'version': TermsFacet(field='version'),
'role_name': NestedFacet(
'domains',
TermsFacet(field='domains.role_name')
),
}
doc_types = [PageDocument]
index = PageDocument._doc_type.index
8 changes: 0 additions & 8 deletions readthedocs/search/views.py
Original file line number Diff line number Diff line change
@@ -103,14 +103,6 @@ def elastic_search(request, project_slug=None):
facets[avail_facet].insert(0, (value, 0, True))

if results:
if user_input.type == 'file':
# Change results to turn newlines in highlight into periods
# https://github.com/rtfd/readthedocs.org/issues/5168
for result in results:
if hasattr(result.meta.highlight, 'content'):
result.meta.highlight.content = [result.replace(
'\n', '. ') for result in result.meta.highlight.content]

log.debug('Search results: %s', pformat(results.to_dict()))
log.debug('Search facets: %s', pformat(results.facets.to_dict()))

4 changes: 3 additions & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -60,7 +60,9 @@ elasticsearch==6.4.0 # pyup: <7.0.0
# File "/home/travis/build/rtfd/readthedocs.org/.tox/py36/lib/python3.6/site-packages/django_elasticsearch_dsl/documents.py", line 8, in <module>
# from elasticsearch_dsl.document import DocTypeMeta as DSLDocTypeMeta
# ImportError: cannot import name 'DocTypeMeta'
elasticsearch-dsl==6.1.0 # pyup: ignore
#
# Commit 97e3f75 adds the NestedFacet
git+https://github.com/elastic/elasticsearch-dsl-py@97e3f756a8cacd1c863d3ced3d17abcafbb0f85e#egg=elasticsearch-dsl==6.1.0
django-elasticsearch-dsl==0.5.1
pyquery==1.4.0