websearch

catalog/views.py

@@ -98,7 +98,6 @@ def getNewsByRequest(request, values=None):
 
 	print("GET REQUEST", request.GET)
 	request.GET = request.GET.copy()
-	request.GET["text"]= html.unescape(request.GET["text"])
 	form = SearchForm(request.GET)
 	myQuery = ~Q()
 	orderBy = "-date"
@@ -119,7 +118,7 @@ def getNewsByRequest(request, values=None):
 		myQuery &= Q(date__lte=edate.strftime("%Y-%m-%d"))
 
 	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(search_vector=SearchQuery(request.GET['text'], search_type='websearch'))
 		textSearchFlag = True