From 8a87c152b4b5ce7c4dc162f5fc2e2e3ba1899031 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 27 May 2023 16:25:06 +0200
Subject: [PATCH] Bugfix opds search

---
 cps/opds.py             | 2 +-
 cps/templates/feed.xml  | 2 +-
 cps/templates/index.xml | 2 +-
 cps/templates/osd.xml   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cps/opds.py b/cps/opds.py
index 6b09a84d..074a9b73 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -55,7 +55,7 @@ def feed_osd():
     return render_xml_template('osd.xml', lang='en-EN')
 
 
-@opds.route("/opds/search", defaults={'query': ""})
+# @opds.route("/opds/search", defaults={'query': ""})
 @opds.route("/opds/search/<path:query>")
 @requires_basic_auth_if_no_ano
 def feed_cc_search(query):
diff --git a/cps/templates/feed.xml b/cps/templates/feed.xml
index d2114157..a483a57f 100644
--- a/cps/templates/feed.xml
+++ b/cps/templates/feed.xml
@@ -30,7 +30,7 @@
     <link rel="search"
       href="{{url_for('opds.feed_osd')}}"
       type="application/opensearchdescription+xml"/>
-  <link type="application/atom+xml" rel="search" title="{{_('Search')}}" href="{{url_for('opds.feed_cc_search')}}/{searchTerms}" />
+  <link type="application/atom+xml" rel="search" title="{{_('Search')}}" href="{{url_for('opds.feed_normal_search')}}/{searchTerms}" />
   <title>{{instance}}</title>
   <author>
     <name>{{instance}}</name>
diff --git a/cps/templates/index.xml b/cps/templates/index.xml
index 4ffd4290..bee40d66 100644
--- a/cps/templates/index.xml
+++ b/cps/templates/index.xml
@@ -8,7 +8,7 @@
   <link rel="search"
       href="{{url_for('opds.feed_osd')}}"
       type="application/opensearchdescription+xml"/>
-  <link type="application/atom+xml" rel="search" title="{{_('Search')}}" href="{{url_for('opds.feed_cc_search')}}/{searchTerms}" />
+  <link type="application/atom+xml" rel="search" title="{{_('Search')}}" href="{{url_for('opds.feed_normal_search')}}/{searchTerms}" />
   <title>{{instance}}</title>
   <author>
     <name>{{instance}}</name>
diff --git a/cps/templates/osd.xml b/cps/templates/osd.xml
index 674303c2..27adb26e 100644
--- a/cps/templates/osd.xml
+++ b/cps/templates/osd.xml
@@ -6,7 +6,7 @@
    <Developer>Janeczku</Developer>
    <Contact>https://github.com/janeczku/calibre-web</Contact>
    <Url type="text/html"
-        template="{{url_for('opds.feed_cc_search')}}/{searchTerms}"/>
+        template="{{url_for('opds.feed_normal_search')}}/{searchTerms}"/>
    <Url type="application/atom+xml"
         template="{{url_for('opds.feed_normal_search')}}?query={searchTerms}"/>
    <SyndicationRight>open</SyndicationRight>