Skip to content

armgit / mwmbl

Public Imported from GitHub
0

An open source, non-profit web search engine

Allow additional results to be passed in

Daoud Clarke06c1958503b4
diff --git a/mwmbl/tinysearchengine/rank.py b/mwmbl/tinysearchengine/rank.py
index 7f331b8..15ea49b 100644
--- a/mwmbl/tinysearchengine/rank.py
+++ b/mwmbl/tinysearchengine/rank.py
@@ -118,17 +118,17 @@ class Ranker:
def order_results(self, terms, pages, is_complete):
pass
- def search(self, s: str):
+ def search(self, s: str, additional_results: list[Document]):
results, terms, _ = self.get_results(s)
is_complete = s.endswith(' ')
pattern = get_query_regex(terms, is_complete, False)
formatted_results = []
- for result in results:
+ for result in additional_results + results:
formatted_result = format_result_with_pattern(pattern, result)
formatted_results.append(formatted_result)
- logger.info("Return results: %r", formatted_results)
+ logger.info("Return results: %d", len(formatted_results))
return formatted_results
def complete(self, q: str):
diff --git a/mwmbl/views.py b/mwmbl/views.py
index 3d59498..6878ba4 100644
--- a/mwmbl/views.py
+++ b/mwmbl/views.py
@@ -88,7 +88,19 @@ class Activity:
def _get_results_and_activity(request):
query = request.GET.get("q")
if query:
- results = ranker.search(query)
+ # There may be extra results in the request that we need to add in
+ # format is ?enhanced=google&title=title1&url=url1&extract=extract1&title=title2&url=url2&extract=extract2
+ # enhanced = request.GET.get("enhanced")
+ titles = request.GET.getlist(f"title")
+ urls = request.GET.getlist(f"url")
+ extracts = request.GET.getlist(f"extract")
+
+ additional_results = [
+ Document(title=title, url=url, extract=extract, score=0.0)
+ for title, url, extract in zip(titles, urls, extracts)
+ ]
+
+ results = ranker.search(query, additional_results=additional_results)
activity = None
else:
results = None