From efe1d87b124128afd6ac8aac2a9dd9de2b96a84d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Garc=C3=ADa?= <josegar74@gmail.com>
Date: Wed, 20 Dec 2023 10:22:59 +0100
Subject: [PATCH] INSPIRE Atom feeds / Fix link to atom search endpoint

---
 web/src/main/webResources/WEB-INF/urlrewrite.xml          | 8 --------
 .../main/webapp/xslt/services/inspire-atom/opensearch.xsl | 2 +-
 .../xslt/services/inspire-atom/opensearchdescription.xsl  | 3 ++-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/web/src/main/webResources/WEB-INF/urlrewrite.xml b/web/src/main/webResources/WEB-INF/urlrewrite.xml
index 6b17866e2a3..6aba2b452f4 100644
--- a/web/src/main/webResources/WEB-INF/urlrewrite.xml
+++ b/web/src/main/webResources/WEB-INF/urlrewrite.xml
@@ -181,14 +181,6 @@
     <to type="forward">/srv/api/atom/feeds</to>
   </rule>
 
-  <rule>
-    <note>
-      INSPIRE HTML search
-    </note>
-    <from>^/(.*)/(.*)/opensearch/htmlsearch\?.*q=(.*)</from>
-    <to type="permanent-redirect">%{context-path}/$1/$2/catalog.search#/search?any=$3</to>
-  </rule>
-
   <rule>
     <note>
       INSPIRE Atom Describe (service)
diff --git a/web/src/main/webapp/xslt/services/inspire-atom/opensearch.xsl b/web/src/main/webapp/xslt/services/inspire-atom/opensearch.xsl
index 86a1c0a5255..dc1c9a4f053 100644
--- a/web/src/main/webapp/xslt/services/inspire-atom/opensearch.xsl
+++ b/web/src/main/webapp/xslt/services/inspire-atom/opensearch.xsl
@@ -56,7 +56,7 @@
 
           <os:Url type="text/html" rel="results">
             <xsl:attribute name="template"
-                           select="concat(/root/gui/url,'/srv/', /root/gui/language,'/opensearch/htmlsearch?q={searchTerms?}')"/>
+                           select="concat(/root/gui/url,'/opensearch/', /root/gui/language,'/search?q={searchTerms?}')"/>
           </os:Url>
         </xsl:when>
         <xsl:otherwise>
diff --git a/web/src/main/webapp/xslt/services/inspire-atom/opensearchdescription.xsl b/web/src/main/webapp/xslt/services/inspire-atom/opensearchdescription.xsl
index 46445d26025..21afe26d26b 100644
--- a/web/src/main/webapp/xslt/services/inspire-atom/opensearchdescription.xsl
+++ b/web/src/main/webapp/xslt/services/inspire-atom/opensearchdescription.xsl
@@ -20,6 +20,7 @@
   <xsl:param name="atomDescribeServiceUrlSuffix" />
   <xsl:param name="atomDescribeDatasetUrlSuffix" />
   <xsl:param name="atomDownloadDatasetUrlSuffix" />
+  <xsl:param name="baseUrl" />
   <xsl:param name="nodeName" />
   <xsl:output method="xml" indent="no" encoding="utf-8"/>
 
@@ -53,7 +54,7 @@
       <Url type="text/html" rel="results">
         <xsl:attribute name="template">
           <xsl:value-of
-            select="concat($nodeUrl, $requestedLanguage, '/', $opensearchUrlSuffix, '/htmlsearch?q={searchTerms?}')"/>
+            select="concat($baseUrl, $opensearchUrlSuffix, '/', $requestedLanguage, '/search?q={searchTerms?}')"/>
         </xsl:attribute>
       </Url>