Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
searx-engine
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
searx-engine
Commits
82bf9c6b
Unverified
Commit
82bf9c6b
authored
6 years ago
by
Noémi Ványi
Committed by
GitHub
6 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1464 from miicha/bugfix_startpage
restore startpage search results
parents
cf8e2246
5b81f7c2
master
iframe-awareness
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
14 deletions
+15
-14
startpage.py
searx/engines/startpage.py
+4
-3
test_startpage.py
tests/unit/engines/test_startpage.py
+11
-11
No files found.
searx/engines/startpage.py
View file @
82bf9c6b
...
...
@@ -32,8 +32,9 @@ search_url = base_url + 'do/search'
# specific xpath variables
# ads xpath //div[@id="results"]/div[@id="sponsored"]//div[@class="result"]
# not ads: div[@class="result"] are the direct childs of div[@id="results"]
results_xpath
=
'//
div[@class="result"
]'
results_xpath
=
'//
li[contains(@class, "search-result") and contains(@class, "search-item")
]'
link_xpath
=
'.//h3/a'
content_xpath
=
'./p[@class="search-item__body"]'
# do search-request
...
...
@@ -79,8 +80,8 @@ def response(resp):
title
=
extract_text
(
link
)
if
result
.
xpath
(
'./p[@class="desc clk"]'
):
content
=
extract_text
(
result
.
xpath
(
'./p[@class="desc clk"]'
))
if
result
.
xpath
(
content_xpath
):
content
=
extract_text
(
result
.
xpath
(
content_xpath
))
else
:
content
=
''
...
...
This diff is collapsed.
Click to expand it.
tests/unit/engines/test_startpage.py
View file @
82bf9c6b
...
...
@@ -31,14 +31,14 @@ class TestStartpageEngine(SearxTestCase):
self
.
assertEqual
(
startpage
.
response
(
response
),
[])
html
=
"""
<
div class='result' style=' *width : auto; *margin-right : 10
%
;'
>
<
li class="search-result search-item"
>
<h3>
<a href='http://this.should.be.the.link/' id='title_2' name='title_2' >
This should be the title
</a>
<span id='title_stars_2' name='title_stars_2'> </span>
</h3>
<p class=
'desc clk'
>
<p class=
"search-item__body"
>
This should be the content.
</p>
<p>
...
...
@@ -56,7 +56,7 @@ class TestStartpageEngine(SearxTestCase):
Mis en surbrillance
</A>
</p>
</
div
>
</
li
>
"""
response
=
mock
.
Mock
(
text
=
html
.
encode
(
'utf-8'
))
results
=
startpage
.
response
(
response
)
...
...
@@ -67,14 +67,14 @@ class TestStartpageEngine(SearxTestCase):
self
.
assertEqual
(
results
[
0
][
'content'
],
'This should be the content.'
)
html
=
"""
<
div class='result' style=' *width : auto; *margin-right : 10
%
;'
>
<
li class="search-result search-item"
>
<h3>
<a href='http://www.google.com/aclk?sa=l&ai=C' id='title_2' name='title_2' >
This should be the title
</a>
<span id='title_stars_2' name='title_stars_2'> </span>
</h3>
<p class=
'desc clk'
>
<p class=
"search-item__body"
>
This should be the content.
</p>
<p>
...
...
@@ -92,20 +92,20 @@ class TestStartpageEngine(SearxTestCase):
Mis en surbrillance
</A>
</p>
</
div
>
<
div class='result' style=' *width : auto; *margin-right : 10
%
;'
>
</
li
>
<
li class="search-result search-item"
>
<h3>
<span id='title_stars_2' name='title_stars_2'> </span>
</h3>
<p class=
'desc clk'
>
<p class=
"search-item__body"
>
This should be the content.
</p>
<p>
<span class='url'>www.speed<b>test</b>.net/fr/
</span>
</p>
</
div
>
<
div class='result' style=' *width : auto; *margin-right : 10
%
;'
>
</
li
>
<
li class="search-result search-item"
>
<h3>
<a href='http://this.should.be.the.link/' id='title_2' name='title_2' >
This should be the title
...
...
@@ -127,7 +127,7 @@ class TestStartpageEngine(SearxTestCase):
Mis en surbrillance
</A>
</p>
</
div
>
</
li
>
"""
response
=
mock
.
Mock
(
text
=
html
.
encode
(
'utf-8'
))
results
=
startpage
.
response
(
response
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment