Browse Source

[refactor] <type> element isn't a part of the RSS 2.0 spec [1]

[1] https://cyber.harvard.edu/rss/rss.html

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Markus Heiser 6 months ago
parent
commit
5fbea0b62d

+ 33 - 53
searx/static/themes/simple/xsl/rss.xsl

@@ -1,59 +1,39 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
   <xsl:output method="html" version="5" encoding="UTF-8" indent="yes" />
   <xsl:output method="html" version="5" encoding="UTF-8" indent="yes" />
-
   <xsl:template match="rss">
   <xsl:template match="rss">
-	<html xmlns="http://www.w3.org/1999/xhtml">
-        <head>
-            <title><xsl:value-of select="channel/title" /> RSS Feed</title>
-            <meta charset="UTF-8" />
-            <meta http-equiv="x-ua-compatible" content="IE=edge,chrome=1" />
-            <meta name="viewport" content="width=device-width,initial-scale=1" />
-            <style type="text/css">
-				html {
-					background: #fff;
-					color: #444;
-				}
-			
-                a {
-					color: #334999;
-					text-decoration: none;
-				}
-
-				a:hover {
-					text-decoration: underline;
-				}
-            </style>
-        </head>
-        <body>
-            <header>
-                <h2>
-                    <xsl:value-of select="channel/description" />
-                </h2>
-            </header>
-			<hr />
-            <main>
-                <xsl:for-each select="channel/item">
-                    <article>
-                        <h3>
-                            <a hreflang="en" target="_blank">
-                                <xsl:attribute name="href">
-                                    <xsl:value-of select="link" />
-                                </xsl:attribute>
-                                <xsl:value-of select="title" />
-                            </a>
-                        </h3>
-                        <time>
-                            <xsl:value-of select="pubDate" />
-                        </time>
-						<p><xsl:value-of select="description" /></p>
-						<hr />
-                    </article>
-                </xsl:for-each>
-            </main>
-        </body>
-    </html>    
+    <html xmlns="http://www.w3.org/1999/xhtml">
+      <head>
+        <title><xsl:value-of select="channel/title" />RSS Feed</title>
+        <meta charset="UTF-8" />
+        <meta http-equiv="x-ua-compatible" content="IE=edge,chrome=1" />
+        <meta name="viewport" content="width=device-width,initial-scale=1" />
+      </head>
+      <body>
+        <header>
+          <h2>
+            <xsl:value-of select="channel/description" />
+          </h2>
+        </header>
+	<hr />
+        <main>
+          <xsl:for-each select="channel/item">
+            <article>
+              <h3>
+                <a hreflang="en" target="_blank">
+                  <xsl:attribute name="href">
+                    <xsl:value-of select="link" />
+                  </xsl:attribute>
+                  <xsl:value-of select="title" />
+                </a>
+              </h3>
+              <time><xsl:value-of select="pubDate" /></time>
+	      <p><xsl:value-of select="description" /></p>
+	      <hr />
+            </article>
+          </xsl:for-each>
+        </main>
+      </body>
+    </html>
   </xsl:template>
   </xsl:template>
-
 </xsl:stylesheet>
 </xsl:stylesheet>

+ 1 - 24
searx/templates/simple/opensearch_response_rss.xml

@@ -21,34 +21,11 @@
     {% for r in results %}
     {% for r in results %}
     <item>
     <item>
       <title>{{ r.title }}</title>
       <title>{{ r.title }}</title>
+      <type>result</type>
       <link>{{ r.url }}</link>
       <link>{{ r.url }}</link>
       <description>{{ r.content }}</description>
       <description>{{ r.content }}</description>
       {% if r.pubdate %}<pubDate>{{ r.pubdate }}</pubDate>{% endif %}
       {% if r.pubdate %}<pubDate>{{ r.pubdate }}</pubDate>{% endif %}
     </item>
     </item>
     {% endfor %}
     {% endfor %}
-    {% if answers %}
-      {% for a in answers %}
-      <item>
-        <title>{{ a }}</title>
-        <type>answer</type>
-      </item>
-      {% endfor %}
-    {% endif %}
-    {% if corrections %}
-      {% for a in corrections %}
-      <item>
-        <title>{{ a }}</title>
-        <type>correction</type>
-      </item>
-      {% endfor %}
-    {% endif %}
-    {% if suggestions %}
-      {% for a in suggestions %}
-      <item>
-        <title>{{ a }}</title>
-        <type>suggestion</type>
-      </item>
-      {% endfor %}
-    {% endif %}
   </channel>
   </channel>
 </rss>
 </rss>

+ 0 - 3
searx/webapp.py

@@ -731,9 +731,6 @@ def search():
         response_rss = render(
         response_rss = render(
             'opensearch_response_rss.xml',
             'opensearch_response_rss.xml',
             results=results,
             results=results,
-            answers=result_container.answers,
-            corrections=result_container.corrections,
-            suggestions=result_container.suggestions,
             q=request.form['q'],
             q=request.form['q'],
             number_of_results=result_container.number_of_results,
             number_of_results=result_container.number_of_results,
         )
         )