removes unused merge-url setting from format-filter

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

@@ -16,7 +16,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.ServletOutputStream; // for SOOA
 
-// from vlkb_mergefiles.java - dir & file handling
 import java.io.*;
 
 import java.nio.file.*;

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

@@ -88,7 +88,6 @@ public class FormatResponseFilter implements Filter
                XmlSerializer.serializeToVoTable(responseWriter, RESPONSE_ENCODING,
                      obsCoreArr,
                      settings.serviceUrls.cutoutUrl(),
-                     settings.serviceUrls.mergeUrl(),
                      showDuration,startTime_msec);
             }
             else

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

@@ -9,17 +9,14 @@ class FormatResponseSettings
    public static class ServiceUrls
    {
       private String cutoutUrl;
-      private String mergeUrl;
 
       public boolean cutoutUrlIsSet() { return (cutoutUrl != null) && cutoutUrl.trim().isEmpty(); }
-      public boolean mergeUrlIsSet()  { return (mergeUrl != null) && mergeUrl.trim().isEmpty(); }
 
       public String cutoutUrl() {return cutoutUrl;}
-      public String mergeUrl()  {return mergeUrl;}
 
       public String toString()
       {
-         return cutoutUrl + "   "  + mergeUrl;
+         return cutoutUrl;
       }
    }
 
@@ -53,7 +50,6 @@ class FormatResponseSettings
    {
       ServiceUrls serviceUrls = new ServiceUrls();
       serviceUrls.cutoutUrl = properties.getProperty("cutout_url","").strip();
-      serviceUrls.mergeUrl  = properties.getProperty("merge_url","").strip();
       return serviceUrls;
    }
 

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

@@ -23,10 +23,11 @@ final class XmlSerializer
    public static void serializeToVoTable(
          PrintWriter writer, String charEncoding,
          DbPSearch.ObsCore[] obsCoreArr,
-         String cutoutUrl, String mergeUrl,
+         String cutoutUrl,
          boolean showDuration, long startTime_msec) throws IOException
    {
-      StarTable dstable = makeSearchResultsTable( obsCoreArr );
+      //StarTable dstable = makeSearchResultsTable( obsCoreArr );
+      /*RowList*/StarTable dstable = new RowListStarTable( ObscoreExt.OBSCORE_VLKB_COLINFO );
 
       dstable.setParameter(new DescribedValue(
                new DefaultValueInfo("datacubeCount", Integer.class, "Count of all datacubes from VLKB-search" ),
@@ -56,19 +57,4 @@ final class XmlSerializer
       out.flush();
    }
 
-   private static StarTable makeSearchResultsTable(DbPSearch.ObsCore[] obsCoreArr)
-   {
-      RowListStarTable astro = new RowListStarTable( ObscoreExt.OBSCORE_VLKB_COLINFO );
-
-      for(DbPSearch.ObsCore obsCore : obsCoreArr)
-      {
-         if(obsCore == null) continue; // FIXME skip mergeable datasets
-
-         astro.addRow( ObscoreExt.obscoreVlkbRow(obsCore) );
-      }
-
-      return astro;
-   }
-
-
 }