Browse Source

[enh] update opensearch.xml to match major search engines opensearch.xml

Adam Tauber 4 years ago
parent
commit
08c13daf85
2 changed files with 6 additions and 16 deletions
  1. 5 15
      searx/templates/__common__/opensearch.xml
  2. 1 1
      searx/webapp.py

+ 5 - 15
searx/templates/__common__/opensearch.xml

@@ -6,23 +6,13 @@
   <Image>{{ urljoin(host, url_for('static', filename='img/favicon.png')) }}</Image>
   <LongName>searx metasearch</LongName>
   {% if opensearch_method == 'get' %}
-    <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/>
-    {% if autocomplete %}
-    <Url type="application/x-suggestions+json" method="get" template="{{ host }}autocompleter">
-        <Param name="format" value="x-suggestions" />
-        <Param name="q" value="{searchTerms}" />
-    </Url>
-    {% endif %}
+    <Url rel="results" type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/>
   {% else %}
-    <Url type="text/html" method="post" template="{{ host }}">
+    <Url rel="results" type="text/html" method="post" template="{{ host }}">
         <Param name="q" value="{searchTerms}" />
     </Url>
-    {% if autocomplete %}
-    <!-- TODO, POST REQUEST doesn't work -->
-    <Url type="application/x-suggestions+json" method="get" template="{{ host }}autocompleter">
-        <Param name="format" value="x-suggestions" />
-        <Param name="q" value="{searchTerms}" />
-    </Url>
-    {% endif %}
+  {% endif %}
+  {% if autocomplete %}
+    <Url rel="suggestions" type="application/json" template="{{ host }}autocompleter"/>
   {% endif %}
 </OpenSearchDescription>

+ 1 - 1
searx/webapp.py

@@ -949,7 +949,7 @@ def opensearch():
 
     resp = Response(response=ret,
                     status=200,
-                    mimetype="text/xml")
+                    mimetype="application/opensearchdescription+xml")
     return resp