From 7fdfeca3a43e0e2bd8ef2dcb27cca7745edf596a Mon Sep 17 00:00:00 2001
From: Alexandre Flament <alex@al-f.net>
Date: Fri, 13 Jan 2017 22:15:11 +0100
Subject: [mod] add a __common__ template that can't be selected but that
 provides a common place for shared templates.

What has been moved into this template :
* opensearch*.xml is always the same whatever the themes.
* the text inside */about.html
---
 .../__common__/opensearch_response_rss.xml         | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 searx/templates/__common__/opensearch_response_rss.xml

(limited to 'searx/templates/__common__/opensearch_response_rss.xml')

diff --git a/searx/templates/__common__/opensearch_response_rss.xml b/searx/templates/__common__/opensearch_response_rss.xml
new file mode 100644
index 000000000..ddb60fa5e
--- /dev/null
+++ b/searx/templates/__common__/opensearch_response_rss.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0"
+     xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"
+     xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>Searx search: {{ q|e }}</title>
+    <link>{{ base_url }}?q={{ q|e }}</link>
+    <description>Search results for "{{ q|e }}" - searx</description>
+    <opensearch:totalResults>{{ number_of_results }}</opensearch:totalResults>
+    <opensearch:startIndex>1</opensearch:startIndex>
+    <opensearch:itemsPerPage>{{ number_of_results }}</opensearch:itemsPerPage>
+    <atom:link rel="search" type="application/opensearchdescription+xml" href="{{ base_url }}opensearch.xml"/>
+    <opensearch:Query role="request" searchTerms="{{ q|e }}" startPage="1" />
+    {% for r in results %}
+    <item>
+      <title>{{ r.title }}</title>
+      <link>{{ r.url }}</link>
+      <description>{{ r.content }}</description>
+      {% if r.pubdate %}<pubDate>{{ r.pubdate }}</pubDate>{% endif %}
+    </item>
+    {% endfor %}
+  </channel>
+</rss>
-- 
cgit v1.2.3


From 15eef0ebdb15af80c026302bef250dc7f4417951 Mon Sep 17 00:00:00 2001
From: Alexandre Flament <alex@al-f.net>
Date: Fri, 20 Jan 2017 18:52:47 +0100
Subject: [enh] validate input and raise an exception inside search.py. The
 exception message is output in json and rss format.

---
 searx/templates/__common__/opensearch_response_rss.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'searx/templates/__common__/opensearch_response_rss.xml')

diff --git a/searx/templates/__common__/opensearch_response_rss.xml b/searx/templates/__common__/opensearch_response_rss.xml
index ddb60fa5e..32c42e7c7 100644
--- a/searx/templates/__common__/opensearch_response_rss.xml
+++ b/searx/templates/__common__/opensearch_response_rss.xml
@@ -11,6 +11,12 @@
     <opensearch:itemsPerPage>{{ number_of_results }}</opensearch:itemsPerPage>
     <atom:link rel="search" type="application/opensearchdescription+xml" href="{{ base_url }}opensearch.xml"/>
     <opensearch:Query role="request" searchTerms="{{ q|e }}" startPage="1" />
+    {% if error_message %}
+    <item>
+      <title>Error</title>
+      <description>{{ error_message|e }}</description>
+    </item>
+    {% endif %}
     {% for r in results %}
     <item>
       <title>{{ r.title }}</title>
-- 
cgit v1.2.3