config: removes obsolote unused serviceUrls from Search config

data-discovery/src/main/java/vlkb/webapi/SearchServlet.java

@@ -28,7 +28,6 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
    {
       super.init();
 
-      LOGGER.info("URLs : " + settings.serviceUrls.toString());
       LOGGER.info("DB   : " + settings.dbConn.toString());
    }
 

data-discovery/src/main/java/vlkb/webapi/SearchSettings.java

@@ -30,31 +30,7 @@ class SearchSettings
       }
    }
 
-
-   public static class ServiceUrls
-   {
-      private String cutoutUrl;
-      private String mergeUrl;
-      private String surveysAbsPathname;
-
-      public boolean cutoutUrlIsSet() { return (cutoutUrl != null) && cutoutUrl.trim().isEmpty(); }
-      public boolean mergeUrlIsSet()  { return (mergeUrl != null) && mergeUrl.trim().isEmpty(); }
-      public boolean surveysAbsPathnameIsSet()
-       { return (surveysAbsPathname != null) && surveysAbsPathname.trim().isEmpty(); }
-
-      public String cutoutUrl() {return cutoutUrl;}
-      public String mergeUrl()  {return mergeUrl;}
-      public String surveysAbsPathname()  {return surveysAbsPathname;}
-
-      public String toString()
-      {
-         return cutoutUrl + "   "  + mergeUrl + "   " + surveysAbsPathname;
-      }
-   }
-
-
    public DBConn     dbConn;
-   public ServiceUrls serviceUrls;
 
 
    // will not start without config-file; no reasonable code-defaults can be invented
@@ -70,9 +46,8 @@ class SearchSettings
             properties.load(ins);
 
             DBConn      dbConn      = loadDBConn(properties);
-            ServiceUrls serviceUrls = loadServiceUrls(properties);
 
-            return new SearchSettings(dbConn, serviceUrls);
+            return new SearchSettings(dbConn/*, serviceUrls*/);
          }
          else
          {
@@ -89,10 +64,9 @@ class SearchSettings
 
 
 
-   private SearchSettings(DBConn dbConn, ServiceUrls serviceUrls)
+   private SearchSettings(DBConn dbConn)
    {
       this.dbConn      = dbConn;
-      this.serviceUrls = serviceUrls;
    }
 
 
@@ -107,16 +81,5 @@ class SearchSettings
       return dbConn;
    }
 
-
-   private static ServiceUrls loadServiceUrls(Properties properties)
-   {
-      ServiceUrls serviceUrls = new ServiceUrls();
-      serviceUrls.cutoutUrl = properties.getProperty("cutout_url","").strip();
-      serviceUrls.mergeUrl  = properties.getProperty("merge_url","").strip();
-      serviceUrls.surveysAbsPathname = properties.getProperty("surveys_metadata_abs_pathname","/srv/surveys/surveys_metadata.csv").strip();
-      return serviceUrls;
-   }
-
-
 }
 

data-discovery/src/main/resources/discovery.properties

 
 # database with 'obscore' table
-db_uri=jdbc:postgresql://localhost:5432/vialactea
-db_schema=datasets
+# db_uri=jdbc:postgresql://localhost:5432/vialactea
+# db_schema=datasets
 db_user_name=
 db_password=
 

data-discovery/src/main/resources/formatresponsefilter.properties

 
-# database with 'surveys' table of metadata used to write VLKB-legacy response.xml
+# database with 'obscore' table
 #db_uri=jdbc:postgresql://localhost:5432/vialactea
 #db_schema=datasets
-#db_user_name=
-#db_password=
-# FIXME above disabled; now read metadata from a file
+db_user_name=
+db_password=
+
+# VLKB-legacy: surveys metadata in csv file
 surveys_abs_pathname=
 
 # these URL's are used in response.xml so client can access those services