Remove q service, used to query in previous versions that used Lucene…

… as the search engine
jodygarnett · Apr 15, 2024 · 1867f2e · 1867f2e
1 parent 77a5834
commit 1867f2e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 323 deletions.
diff --git a/services/src/main/java/org/fao/geonet/services/main/XmlSearch.java b/services/src/main/java/org/fao/geonet/services/main/XmlSearch.java
diff --git a/services/src/test/java/org/fao/geonet/services/main/XmlSearchTest.java b/services/src/test/java/org/fao/geonet/services/main/XmlSearchTest.java
diff --git a/web/src/main/webapp/WEB-INF/config/config-service-dcat-rdf.xml b/web/src/main/webapp/WEB-INF/config/config-service-dcat-rdf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
+  ~ Copyright (C) 2001-2024 Food and Agriculture Organization of the
   ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
   ~ and United Nations Environment Programme (UNEP)
   ~
@@ -25,19 +25,6 @@
 <geonet>
   <services package="org.fao.geonet">
 
-
-    <service name="rdf.search">
-      <documentation>Search the catalogue and return results in RDF/DCAT format.</documentation>
-      <class name=".services.main.XmlSearch">
-        <!-- rdf.xsl requires the full metadata, returned only if fast=false in the searcher -->
-        <param name="fast" value="false"/>
-        <param name="maxRecords" value="100"/>
-      </class>
-      <output sheet="../xslt/services/dcat/rdf.xsl"
-              contentType=" application/rdf+xml; charset=UTF-8"/>
-      <error id="search-error" sheet="../xslt/common/error/error-xml.xsl" statusCode="500"/>
-    </service>
-
     <service name="rdf.metadata.public.get">
       <documentation>Return all public metadata in RDF/DCAT format.</documentation>
       <class name="org.fao.geonet.services.rdf.GetPublicMetadataAsRdf">

diff --git a/web/src/main/webapp/WEB-INF/config/config-service-search.xml b/web/src/main/webapp/WEB-INF/config/config-service-search.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
+  ~ Copyright (C) 2001-2024 Food and Agriculture Organization of the
   ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
   ~ and United Nations Environment Programme (UNEP)
   ~
@@ -24,43 +24,6 @@
 
 <geonet>
   <services package="org.fao.geonet">
-    <!-- Search services -->
-    <service name="q">
-      <documentation><![CDATA[
-        Main search services.
-
-        Parameters:
-        * All Lucene search field
-        * fast: (optional) if "index" the index is used to return the results
-        (see dumpfields for output format configuration). if "false", the database
-        is used to return the results in their original formats.
-        * hitsperpage: (optional) The number of hits to return
-        * summaryOnly: (optional) if "true", only the facets are retruned
-        * sortBy: (optional) Default relevance.
-        * sortOrder: (optional) reverse or empty.
-
-        // TODO : improve
-        ]]></documentation>
-      <class name=".services.main.XmlSearch">
-        <!-- Note: this parameter will affect the server's response,
-             the parameter client-side is not related to this one. -->
-        <param name="maxRecords" value="100" />
-      </class>
-    </service>
-
-    <service name="qi">
-      <documentation>
-        <![CDATA[
-      Same as q service but used internally by the application
-      in order to make distinction between user search and
-      application search in statistics.
-      ]]>
-      </documentation>
-      <class name=".services.main.XmlSearch">
-        <param name="maxRecords" value="100" />
-      </class>
-    </service>
-
     <service name="lang">
       <documentation><![CDATA[
         Return all ISO languages.