renames DbPSearch -> DbObstap

data-discovery/src/main/java/search/DbPSearch.java → data-discovery/src/main/java/search/DbObstap.java

@@ -21,13 +21,13 @@ import java.lang.ClassNotFoundException;
 
 import vo.parameter.*;
 
-public class DbPSearch
+public class DbObstap
 {
-   private static final Logger LOGGER = Logger.getLogger(DbPSearch.class.getName());
+   private static final Logger LOGGER = Logger.getLogger(DbObstap.class.getName());
    private DbConnArgs dbConnArgs;
 
 
-   DbPSearch(DbConnArgs dbConnArgs)
+   DbObstap(DbConnArgs dbConnArgs)
    {
       this.dbConnArgs = dbConnArgs;
    }

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

@@ -78,12 +78,12 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
 
          /* query Obscore table */
 
-         DbPSearch dbps;
-         synchronized(DbPSearch.class)
+         DbObstap dbObstap;
+         synchronized(DbObstap.class)
          {
-            dbps = new DbPSearch(settings.dbConnArgs);
+            dbObstap = new DbObstap(settings.dbConnArgs);
          }
-         String[] pubdidArr = dbps.queryOverlapingPubdid(qArgs);
+         String[] pubdidArr = dbObstap.queryOverlapingPubdid(qArgs);
 
          LOGGER.info("Found " + pubdidArr.length + " records");
 

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

@@ -64,7 +64,7 @@ public class FormatResponseFilter implements Filter
             Pos  pos  = Pos.parsePos(params, DEFAULT_SKY_SYSTEM);
             Band band = Band.parseBand(params, DEFAULT_SPEC_SYSTEM);
 
-            DbPSearch.ObsCore[] obsCoreArr = queryObsCore(responseWrapper.getDbConnArgs(), pubdidArr, pos, band);
+            DbObstap.ObsCore[] obsCoreArr = queryObsCore(responseWrapper.getDbConnArgs(), pubdidArr, pos, band);
 
             String respFormat;
             String respFormatReq[] = params.get("RESPONSEFORMAT");
@@ -150,19 +150,19 @@ public class FormatResponseFilter implements Filter
    }
 
 
-   private DbPSearch.ObsCore[] queryObsCore(DbConnArgs dbConnArgs, String[] pubdidArr, Pos pos, Band band)
+   private DbObstap.ObsCore[] queryObsCore(DbConnArgs dbConnArgs, String[] pubdidArr, Pos pos, Band band)
          throws Exception
       {
 
          LOGGER.fine("trace");
 
-         DbPSearch dbps;
-         synchronized(DbPSearch.class)
+         DbObstap dbObstap;
+         synchronized(DbObstap.class)
          {
-            dbps = new DbPSearch(dbConnArgs);
+            dbObstap = new DbObstap(dbConnArgs);
          }
 
-         return dbps.queryOutputData(pubdidArr, pos, band);
+         return dbObstap.queryOutputData(pubdidArr, pos, band);
       }
 
 }

data-discovery/src/main/java/webapi/formatfilter/ObscoreExt.java

@@ -75,7 +75,7 @@ class ObscoreExt
       new ColumnInfo( "instrument_name", String.class, "Instrument" ),
    };
 
-   public static Object[] obscoreRow( DbPSearch.ObsCore obsCore )
+   public static Object[] obscoreRow( DbObstap.ObsCore obsCore )
    {
       return new Object[]
       {
@@ -138,7 +138,7 @@ class ObscoreExt
       new ColumnInfo( "vel_max",    Double.class, "Velocity max" ),
    };
 
-   public static Object[] vlkbRow( DbPSearch.ObsCore obsCore )
+   public static Object[] vlkbRow( DbObstap.ObsCore obsCore )
    {
       return new Object[]
       {
@@ -157,7 +157,7 @@ class ObscoreExt
 
    public static final ColumnInfo[] OBSCORE_VLKB_COLINFO = concat(OBSCORE_COLINFO, VLKB_COLINFO);
 
-   public static Object[] obscoreVlkbRow( DbPSearch.ObsCore obsCore )
+   public static Object[] obscoreVlkbRow( DbObstap.ObsCore obsCore )
    {
       return concat(obscoreRow(obsCore),vlkbRow(obsCore));
    }

data-discovery/src/main/java/webapi/formatfilter/XmlSerializer.java

@@ -22,7 +22,7 @@ final class XmlSerializer
 
    public static void serializeToVoTable(
          PrintWriter writer, String charEncoding,
-         DbPSearch.ObsCore[] obsCoreArr,
+         DbObstap.ObsCore[] obsCoreArr,
          String cutoutUrl,
          boolean showDuration, long startTime_msec) throws IOException
    {