Rank

catalog/views.py

@@ -96,8 +96,9 @@ def getNewsByRequest(request, values=None):
 
 	form = SearchForm(request.GET)
 	myQuery = ~Q()
-
-
+	orderBy = "-date"
+	textSearchFlag = False
+	
 	if 'publishers' in request.GET and request.GET['publishers']!="None" and request.GET['publishers']!="" and request.GET['publishers']!="[]":
 		myQuery &= Q(publisher_id__in=form['publishers'].value())
 	else:
@@ -113,16 +114,18 @@ 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']!="":
+	
 	#	myQuery &= Q(text__search=request.GET['text'])
 		myQuery &= Q(search_vector=SearchQuery(request.GET['text']))
-#		myQuery &= Q(search=request.GET['text'])
-		
-
-	print (myQuery)
-#	if values is None:
-	return News.objects.filter(myQuery)
-#	else:
-#		return News.objects.filter(myQuery).values(",".join(values))
+		orderBy="-rank"
+		textSearchFlag = True
+	
+	print (myQuery) 
+	news_result = News.objects.filter(myQuery).order_by(orderBy)
+	if textSearchFlag:
+		news_result=news_result.annotate(rank=SearchRank(SearchVector("text"), SearchQuery(request.GET['text']), normalization=Value(2).bitor(Value(4)),)).order_by("-rank").
+	return news_result
+
 #-------------------------------------------------------------------------------
 def status(request):
 	tPublishers = Publisher.objects.filter(type="texto").filter(active=True)