free
/
searx
Bevaka 1
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 11 Wiki Activity
Bläddra i källkod

deactivate autocompleter by default

Thomas Pointhuber 11 år sedan
förälder
cc7f3cb617
incheckning
c8cf95aa56
5 ändrade filer med 45 tillägg och 21 borttagningar
Delad Vy Visa Diff Statistik
  1. 3
    0
      searx/settings.yml
  2. 17
    15
      searx/static/js/searx.js
  3. 6
    0
      searx/templates/base.html
  4. 4
    0
      searx/templates/opensearch.xml
  5. 15
    6
      searx/webapp.py

+ 3
- 0
searx/settings.yml Visa fil 

@@ -5,6 +5,9 @@ server:
5 5 
     request_timeout : 2.0 # seconds
6 6 
     base_url : False
7 7
8 
+client:
9 
+    autocompleter : False # only for developers, no real results yet
10 
+
8 11 
 engines:
9 12 
   - name : wikipedia
10 13 
     engine : wikipedia

+ 17
- 15
searx/static/js/searx.js Visa fil 

@@ -1,18 +1,20 @@
1 
-window.addEvent('domready', function() {
2 
-	new Autocompleter.Request.JSON('q', '/autocompleter', {
3 
-		postVar:'q',
4 
-		postData:{
5 
-			'format': 'json'
6 
-		},
7 
-		ajaxOptions:{
8 
-		    timeout: 5   // Correct option?
9 
-		},
10 
-		'minLength': 4,
11 
-		'selectMode': 'type-ahead',
12 
-		cache: true,
13 
-		delay: 300
14 
-	});
15 
-});
1 
+if(searx.autocompleter) {
2 
+    window.addEvent('domready', function() {
3 
+	    new Autocompleter.Request.JSON('q', '/autocompleter', {
4 
+		    postVar:'q',
5 
+		    postData:{
6 
+			    'format': 'json'
7 
+		    },
8 
+		    ajaxOptions:{
9 
+		        timeout: 5   // Correct option?
10 
+		    },
11 
+		    'minLength': 4,
12 
+		    'selectMode': 'type-ahead',
13 
+		    cache: true,
14 
+		    delay: 300
15 
+	    });
16 
+    });
17 
+}
16 18
17 19 
 (function (w, d) {
18 20 
     'use strict';

+ 6
- 0
searx/templates/base.html Visa fil 

@@ -13,13 +13,19 @@
13 13 
     {% block head %}
14 14 
     <link title="searx" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
15 15 
     {% endblock %}
16 
+    <script type="text/javascript">
17 
+        searx = {};
18 
+        searx.autocompleter = {% if client.autocompleter %}true{% else %}false{% endif %};
19 
+    </script>
16 20 
 </head>
17 21 
 <body>
18 22 
 <div id="container">
19 23 
 {% block content %}
20 24 
 {% endblock %}
25 
+{% if client.autocompleter %}
21 26 
 <script src="{{ url_for('static', filename='js/mootools-core-1.4.5-min.js') }}" ></script>
22 27 
 <script src="{{ url_for('static', filename='js/mootools-autocompleter-1.1.2-min.js') }}" ></script>
28 
+{% endif %}
23 29 
 <script src="{{ url_for('static', filename='js/searx.js') }}" ></script>
24 30 
 </div>
25 31 
 </body>

+ 4
- 0
searx/templates/opensearch.xml Visa fil 

@@ -6,18 +6,22 @@
6 6 
   <LongName>searx metasearch</LongName>
7 7 
   {% if method == 'get' %}
8 8 
     <Url type="text/html" method="get" template="{{ host }}?q={searchTerms}"/>
9 
+    {% if client.autocompleter %}
9 10 
     <Url type="application/x-suggestions+json" method="get" template="{{ host }}autocompleter">
10 11 
         <Param name="format" value="x-suggestions" />
11 12 
         <Param name="q" value="{searchTerms}" />
12 13 
     </Url>
14 
+    {% endif %}
13 15 
   {% else %}
14 16 
     <Url type="text/html" method="post" template="{{ host }}">
15 17 
         <Param name="q" value="{searchTerms}" />
16 18 
     </Url>
19 
+    {% if client.autocompleter %}
17 20 
     <!-- TODO, POST REQUEST doesn't work -->
18 21 
     <Url type="application/x-suggestions+json" method="get" template="{{ host }}autocompleter">
19 22 
         <Param name="format" value="x-suggestions" />
20 23 
         <Param name="q" value="{searchTerms}" />
21 24 
     </Url>
25 
+    {% endif %}
22 26 
   {% endif %}
23 27 
 </OpenSearchDescription>

+ 15
- 6
searx/webapp.py Visa fil 

@@ -120,12 +120,18 @@ def index():
120 120 
     """
121 121
122 122 
     if not request.args and not request.form:
123 
-        return render('index.html')
123 
+        return render(
124 
+            'index.html',
125 
+            client=settings['client']
126 
+        )
124 127
125 128 
     try:
126 129 
         search = Search(request)
127 130 
     except:
128 
-        return render('index.html')
131 
+        return render(
132 
+            'index.html',
133 
+            client=settings['client']
134 
+        )
129 135
130 136 
     # TODO moar refactor - do_search integration into Search class
131 137 
     search.results, search.suggestions = do_search(search.query,
 
@@ -206,6 +212,7 @@ def index():
206 212 
     return render(
207 213 
         'results.html',
208 214 
         results=search.results,
215 
+        client=settings['client'],
209 216 
         q=search.request_data['q'],
210 217 
         selected_categories=search.categories,
211 218 
         paging=search.paging,
 
@@ -231,12 +238,14 @@ def autocompleter():
231 238 
     else:
232 239 
         request_data = request.args
233 240
234 
-    # TODO fix XSS-vulnerability, remove test code
241 
+    # TODO fix XSS-vulnerability
235 242 
     autocompleter.querry = request_data.get('q')
236 243 
     autocompleter.results = []
237 244
238 
-    if autocompleter.querry:
239 
-        autocompleter.results = [autocompleter.querry + "-searx",autocompleter.querry + " asfded",autocompleter.querry + " asdf"]
245 
+    if settings['client']['autocompleter']:
246 
+        #TODO remove test code and add real autocompletion
247 
+        if autocompleter.querry:
248 
+            autocompleter.results = [autocompleter.querry + " result-1",autocompleter.querry + " result-2",autocompleter.querry + " result-3",autocompleter.querry + " result-4"]
240 249
241 250 
     if request_data.get('format') == 'x-suggestions':
242 251 
         return Response(json.dumps([autocompleter.querry,autocompleter.results]),
 
@@ -344,7 +353,7 @@ def opensearch():
344 353 
     # chrome/chromium only supports HTTP GET....
345 354 
     if request.headers.get('User-Agent', '').lower().find('webkit') >= 0:
346 355 
         method = 'get'
347 
-    ret = render('opensearch.xml', method=method, host=get_base_url())
356 
+    ret = render('opensearch.xml', method=method, host=get_base_url(),client=settings['client'])
348 357 
     resp = Response(response=ret,
349 358 
                     status=200,
350 359 
                     mimetype="application/xml")