config: adss DB-config to Format-filter (Search-servlet ahs its own config...

config: adss DB-config to Format-filter (Search-servlet ahs its own config entry) and Db-search module is inited by Search-config or Format-config

data-discovery/config/Makefile

@@ -3,7 +3,7 @@ DBMS   ?= localhost  # localhost | pasquale | pasquale-devel
 AUTH   ?=            # ia2token | garrtoken | <empty>
 ################################################################
 
-all: authpolicy.properties web.xml discovery.properties
+all: formatresponsefilter.properties authpolicy.properties web.xml discovery.properties
 
 web.xml:
 	cd web-xml && cat web.xml-begining web.xml-format-filter web.xml-$(AUTH)-filter web.xml-authorization-filter web.xml-servlets web.xml-ending > ../web.xml
@@ -11,9 +11,12 @@ web.xml:
 discovery.properties: discovery.properties.in
 	cat dbms.conf-$(DBMS) discovery.properties.in > $@
 
+formatresponsefilter.properties: formatresponsefilter.properties.in
+	cat dbms.conf-$(DBMS) formatresponsefilter.properties.in > $@
+
 authpolicy.properties: dbms.conf-$(DBMS)
 	cp dbms.conf-$(DBMS) $@
 
 .PHONY:
 clean:
-	-rm -f authpolicy.properties discovery.properties web.xml
+	-rm -f formatresponsefilter.properties authpolicy.properties discovery.properties web.xml

data-discovery/src/main/java/vlkb/search/DbPSearch.java

@@ -23,9 +23,15 @@ import java.lang.ClassNotFoundException;
 public class DbPSearch
 {
    private static final Logger LOGGER = Logger.getLogger(DbPSearch.class.getName());
-   private static final SearchSettings.DBConn dbConn = SearchSettings.getInstance("discovery.properties").dbConn;
+   //private static final SearchSettings.DBConn dbConn = SearchSettings.getInstance("discovery.properties").dbConn;
+   private DBConn dbConn;
 
-   private static final String DB_DRIVER = "org.postgresql.Driver";
+   //private static final String DB_DRIVER = "org.postgresql.Driver";
+
+   DbPSearch(DBConn dbConn)
+   {
+      this.dbConn = dbConn;
+   }
 
    public String[] queryOverlapingPubdid(Coord coord, SubsurveyId subsurveyId)
    {

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

+
+class DBConn
+{
+   public String uri;
+   public String schema;
+   public String user_name;
+   public String password;
+
+   public String uri() {return uri;}
+   public String schema() {return schema;}
+   public String userName() {return user_name;}
+   public String password() {return password;}
+
+   public String toString()
+   {
+      return uri + "  schema[" + schema +  "] " + user_name + " / " + password;
+   }
+}
+

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

@@ -73,6 +73,7 @@ public class FormatResponseFilter implements Filter
       dbSubsurveyArr = Subsurvey.loadSubsurveys(surveysAbsPathname);
       LOGGER.info("Surveys: loaded metadata for " + dbSubsurveyArr.length + " known surveys");
       LOGGER.info("Default charset: " + Charset.defaultCharset());
+      LOGGER.info("DB: " + settings.dbConn.toString());
    }
 
 
@@ -224,7 +225,7 @@ public class FormatResponseFilter implements Filter
       DbPSearch dbps;
       synchronized(DbPSearch.class)
       {
-         dbps = new DbPSearch();
+         dbps = new DbPSearch(settings.dbConn);
       }
 
       return dbps.queryOutputData(pubdidArr, coord);

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

@@ -11,7 +11,7 @@ class FormatResponseSettings
 {
    private static final Logger LOGGER = Logger.getLogger("FormatResponseSettings");
 
-
+/*
    public static class DBConn
    {
       private String uri;
@@ -29,7 +29,7 @@ class FormatResponseSettings
          return uri + "  schema[" + schema +  "] " + user_name + " / " + password;
       }
    }
-
+*/
 
    public static class ServiceUrls
    {
@@ -101,7 +101,7 @@ class FormatResponseSettings
 
    private static DBConn loadDBConn(Properties properties)
    {
-      DBConn dbConn = new FormatResponseSettings.DBConn();
+      DBConn dbConn = new DBConn();
       dbConn.uri       = properties.getProperty("db_uri","jdbc:postgresql://localhost:5432/vialactea").strip();
       dbConn.schema    = properties.getProperty("db_schema","datasets").strip();
       dbConn.user_name = properties.getProperty("db_user_name","").strip();

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

@@ -64,7 +64,7 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
          DbPSearch dbps;
          synchronized(DbPSearch.class)
          {
-            dbps = new DbPSearch();
+            dbps = new DbPSearch(settings.dbConn);
          }
          String[] pubdidArr = dbps.queryOverlapingPubdid(coord, subsurveyId);
 

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

@@ -11,7 +11,7 @@ class SearchSettings
 {
    private static final Logger LOGGER = Logger.getLogger("SearchSettings");
 
-
+/*
    public static class DBConn
    {
       private String uri;
@@ -29,7 +29,7 @@ class SearchSettings
          return uri + "  schema[" + schema +  "] " + user_name + " / " + password;
       }
    }
-
+*/
    public DBConn     dbConn;
 
 
@@ -47,7 +47,7 @@ class SearchSettings
 
             DBConn      dbConn      = loadDBConn(properties);
 
-            return new SearchSettings(dbConn/*, serviceUrls*/);
+            return new SearchSettings(dbConn);
          }
          else
          {
@@ -72,7 +72,7 @@ class SearchSettings
 
    private static DBConn loadDBConn(Properties properties)
    {
-      DBConn dbConn = new SearchSettings.DBConn();
+      DBConn dbConn = new DBConn();
       dbConn.uri       = properties.getProperty("db_uri","jdbc:postgresql://localhost:5432/vialactea").strip();
       dbConn.schema    = properties.getProperty("db_schema","datasets").strip();
       dbConn.user_name = properties.getProperty("db_user_name","").strip();

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

@@ -6,7 +6,7 @@ db_user_name=
 db_password=
 
 # VLKB-legacy: surveys metadata in csv file
-surveys_abs_pathname=
+surveys_metadata_abs_pathname=
 
 # these URL's are used in response.xml so client can access those services
 cutout_url=