Adding q.alt parameter

Sergio Oliveira
1 parent 8343c8a3
Showing 1 changed file with 12 additions and 11 deletions Show diff stats
src/search/forms.py
@@ -91,17 +91,18 @@ class ColabSearchForm(SearchForm):
         if self.cleaned_data['used_by']:
             sqs = sqs.filter_or(used_by__in=self.cleaned_data['used_by'].split())
  
-        if self.cleaned_data.get('q'):
-            q = unicodedata.normalize(
-                'NFKD', unicode(self.cleaned_data.get('q'))
-            ).encode('ascii', 'ignore')
-            sqs = sqs.filter(content=AltParser(
-                'dismax',
-                q,
-                pf='title^2.1 author^1.9 description^1.7',
-                mm='2<70%',
-                bf='recip(ms(NOW/DAY,modified),3.16e-11,1,1)^10',
-            ))
+        q = unicodedata.normalize(
+            'NFKD', unicode(self.cleaned_data.get('q'))
+        ).encode('ascii', 'ignore')
+
+        dismax_opts = {
+            'q.alt': '*.*',
+            'pf': 'title^2.1 author^1.9 description^1.7',
+            'mm': '2<70%',
+            'bf': 'recip(ms(NOW/DAY,modified),3.16e-11,1,1)^10',
+        }
+
+        sqs = sqs.filter(content=AltParser('dismax', q, **dismax_opts))
  
         if self.cleaned_data['type']:
             sqs = sqs.filter(type=self.cleaned_data['type'])
...	...	@@ -91,17 +91,18 @@ class ColabSearchForm(SearchForm):
91	91	if self.cleaned_data['used_by']:
92	92	sqs = sqs.filter_or(used_by__in=self.cleaned_data['used_by'].split())
93	93
94		- if self.cleaned_data.get('q'):
95		- q = unicodedata.normalize(
96		- 'NFKD', unicode(self.cleaned_data.get('q'))
97		- ).encode('ascii', 'ignore')
98		- sqs = sqs.filter(content=AltParser(
99		- 'dismax',
100		- q,
101		- pf='title^2.1 author^1.9 description^1.7',
102		- mm='2<70%',
103		- bf='recip(ms(NOW/DAY,modified),3.16e-11,1,1)^10',
104		- ))
	94	+ q = unicodedata.normalize(
	95	+ 'NFKD', unicode(self.cleaned_data.get('q'))
	96	+ ).encode('ascii', 'ignore')
	97	+
	98	+ dismax_opts = {
	99	+ 'q.alt': '.',
	100	+ 'pf': 'title^2.1 author^1.9 description^1.7',
	101	+ 'mm': '2<70%',
	102	+ 'bf': 'recip(ms(NOW/DAY,modified),3.16e-11,1,1)^10',
	103	+ }
	104	+
	105	+ sqs = sqs.filter(content=AltParser('dismax', q, **dismax_opts))
105	106
106	107	if self.cleaned_data['type']:
107	108	sqs = sqs.filter(type=self.cleaned_data['type'])
...	...