websearch

catalog/views.py

@@ -51,7 +51,7 @@ from stop_words import get_stop_words
 AUDIOPATH = "/home/geoint/M3_NFS/recordings/"
 from django.contrib.postgres.search import SearchQuery, SearchRank, SearchVector
 from django.db.models import Value
-
+import html
 #-------------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------------
@@ -97,7 +97,7 @@ def getNewsByRequest(request, values=None):
 
 	print("GET REQUEST", request.GET)
 	request.GET = request.GET.copy()
-	request.GET["text"]= urllib.parse.unquote(request.GET["text"])
+	request.GET["text"]= html.unescape(request.GET["text"])
 	form = SearchForm(request.GET)
 	myQuery = ~Q()
 	orderBy = "-date"
@@ -343,7 +343,7 @@ def wsNewsList(request):#, publisherShortName="all"):
 	endDate = datetime.datetime.today()
 
 	request.GET = request.GET.copy()
-	request.GET["text"]= urllib.parse.unquote(request.GET["text"])
+	request.GET["text"]= html.unescape(request.GET["text"])
 	print ("GET REQUEST 2", request.GET)
 	if 'ajaxPublishers[]' in request.GET:
 		request.GET.setlist('publishers', request.GET.getlist('ajaxPublishers[]'))