Skip to content

m3_webInterface
m3_webInterface
Commit a38e81f4 authored by Mario Chirinos's avatar Mario Chirinos
Browse files
Options

websearch

parent 2dc0d527
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
catalog/views.py
View file @ a38e81f4
...@@ -98,7 +98,6 @@ def getNewsByRequest(request, values=None): ...@@ -98,7 +98,6 @@ def getNewsByRequest(request, values=None):
print("GET REQUEST", request.GET) print("GET REQUEST", request.GET)
request.GET = request.GET.copy() request.GET = request.GET.copy()
request.GET["text"]= html.unescape(request.GET["text"])
form = SearchForm(request.GET) form = SearchForm(request.GET)
myQuery = ~Q() myQuery = ~Q()
orderBy = "-date" orderBy = "-date"
...@@ -119,7 +118,7 @@ def getNewsByRequest(request, values=None): ...@@ -119,7 +118,7 @@ def getNewsByRequest(request, values=None):
myQuery &= Q(date__lte=edate.strftime("%Y-%m-%d")) myQuery &= Q(date__lte=edate.strftime("%Y-%m-%d"))
if "text" in request.GET and request.GET['text']!="None" and request.GET['text']!="": if "text" in request.GET and request.GET['text']!="None" and request.GET['text']!="":
request.GET["text"]= html.unescape(request.GET["text"])
# myQuery &= Q(text__search=request.GET['text']) # myQuery &= Q(text__search=request.GET['text'])
myQuery &= Q(search_vector=SearchQuery(request.GET['text'], search_type='websearch')) myQuery &= Q(search_vector=SearchQuery(request.GET['text'], search_type='websearch'))
textSearchFlag = True textSearchFlag = True
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment