Merge branch 'remove-z3950-keep-sru' into develop

geonetwork · Jun 6, 2016 · 3e92ddc · 3e92ddc
2 parents 8f8044c + eaed060
commit 3e92ddc
Show file tree

Hide file tree

Showing 113 changed files with 63 additions and 3,825 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 * An interactive Web Map Viewer to combine Web Map Services from distributed servers around the world
 * Online editing of metadata with a powerful template system
 * Scheduled harvesting and synchronization of metadata between distributed catalogs
-* Support for OGC-CSW 2.0.2 ISO Profile, OAI-PMH, Z39.50 protocols
+* Support for OGC-CSW 2.0.2 ISO Profile, OAI-PMH, SRU protocols
 * Fine-grained access control with group and user management
 * Multi-lingual user interface
 

diff --git a/core/src/main/java/org/fao/geonet/constants/Geonet.java b/core/src/main/java/org/fao/geonet/constants/Geonet.java
@@ -64,8 +64,6 @@ public final class Geonet {
     public static final String SEARCH_ENGINE = GEONETWORK + ".search";
     public static final String FACET_ENGINE = GEONETWORK + ".facet";
     public static final String CUSTOM_ELEMENTSET = GEONETWORK + ".customelementset";
-    public static final String Z3950_SERVER = GEONETWORK + ".z3950server";
-    public static final String Z3950 = GEONETWORK + ".z3950";
     public static final String INDEX_ENGINE = GEONETWORK + ".index";
     public static final String LUCENE = GEONETWORK + ".lucene";
     public static final String LUCENE_TRACKING = LUCENE + ".tracking";
@@ -127,7 +125,6 @@ public static final class File {
         public static final String SCHEMA_OASIS = "oasis-catalog.xml";
         public static final String SCHEMA_PLUGINS_CATALOG = "schemaplugin-uri-catalog.xml";
         public static final String SORT_HARVESTERS = "sort-harvesters.xsl";
-        public static final String JZKITCONFIG_TEMPLATE = "JZKitConfig.xml.tem";
         public static final String JZKITAPPLICATIONCONTEXT = "JZkitApplicationContext.xml";
 
         /**
@@ -420,27 +417,6 @@ public static final class SearchResult {
          */
         public static final String EXTENDED = "extended";
 
-        /**
-         * Parameter name: {@value #REMOTE} - Boolean that indicates if search is done on the local
-         * repository or using Z39.50 for on the fly searches in remote catalogs. Values are {@value
-         * org.fao.geonet.constants.Geonet.Text#ON} or {@value org.fao.geonet.constants.Geonet.Text#OFF}
-         * (default)
-         */
-        public static final String REMOTE = "remote";
-
-        /**
-         * Parameter name: {@value #TIMEOUT} - Time in seconds the Z39.50 search waits for responses
-         * from remote servers before timing out. Default is 20 seconds
-         */
-        public static final String TIMEOUT = "timeout";
-
-        /**
-         * Parameter name: {@value #SERVERHTML} - Boolean that indicates whether remote Z39.50
-         * server should return HTML or XML. Values are {@value org.fao.geonet.constants.Geonet.Text#ON}
-         * or {@value org.fao.geonet.constants.Geonet.Text#OFF} (default)
-         */
-        public static final String SERVERHTML = "serverhtml";
-
         /**
          * Parameter name: {@value #HITS_PER_PAGE} - Number of results returned by the search
          * engine. Default is 10 results

diff --git a/core/src/main/java/org/fao/geonet/kernel/search/SearchManager.java b/core/src/main/java/org/fao/geonet/kernel/search/SearchManager.java
@@ -552,7 +552,6 @@ public void initNonStaticData(boolean logAsynch, boolean logSpatialObject, Strin
         _luceneTermsToExclude = luceneTermsToExclude;
 
         initLucene();
-        initZ3950();
 
         _luceneOptimizerManager = new LuceneOptimizerManager(this, settingInfo);
     }
@@ -570,7 +569,6 @@ public void end() throws Exception {
         } else {
             Log.error(Geonet.SEARCH_ENGINE, "Unable to get a hook on the application context (already destroyed ?).");
         }
-        endZ3950();
         _spatial.end();
         _luceneOptimizerManager.cancel();
     }
@@ -623,8 +621,6 @@ public synchronized void disableOptimizer() throws Exception {
         _luceneOptimizerManager.cancel();
     }
 
-    // Z39.50 init/end methods
-
     /**
      * TODO javadoc.
      */
@@ -643,8 +639,6 @@ public MetaSearcher newSearcher(SearcherType type, String stylesheetName) throws
         switch (type) {
             case LUCENE:
                 return new LuceneSearcher(this, stylesheetName, luceneConfig);
-            case Z3950:
-                return new Z3950Searcher(this, schemaManager, stylesheetName);
             case UNUSED:
                 return new UnusedSearcher();
             default:
@@ -659,18 +653,6 @@ private void initLucene() throws Exception {
         setupIndex(false);
     }
 
-    /**
-     * Initializes the Z3950 client searcher.
-     */
-    private void initZ3950() {
-    }
-
-    /**
-     * deinitializes the Z3950 client searcher.
-     */
-    private void endZ3950() {
-    }
-
     public Path getHtmlCacheDir() {
         return _htmlCacheDir;
     }

diff --git a/core/src/main/java/org/fao/geonet/kernel/search/UserQueryInput.java b/core/src/main/java/org/fao/geonet/kernel/search/UserQueryInput.java
@@ -66,12 +66,10 @@ public class UserQueryInput {
         Geonet.SearchResult.FAST,
         Geonet.SearchResult.SORT_BY,
         Geonet.SearchResult.SORT_ORDER,
-        Geonet.SearchResult.REMOTE,
         Geonet.SearchResult.EXTENDED,
         Geonet.SearchResult.INTERMAP,
         Geonet.SearchResult.HITS_PER_PAGE,
         Geonet.SearchResult.GEOMETRY,
-        Geonet.SearchResult.TIMEOUT,
         Geonet.SearchResult.OUTPUT,
         Geonet.SearchResult.SUMMARY_ONLY,
         Geonet.SearchResult.BUILD_SUMMARY,