diff --git a/data-access/servlet/src/main/java/webapi/ServletMCutout.java b/data-access/servlet/src/main/java/webapi/ServletMCutout.java
index 3afae6d0067fb9ccda3b8d7114b45cffbed26696..9131f21e75030d90ec5aa485764a01dde4b93f0f 100644
--- a/data-access/servlet/src/main/java/webapi/ServletMCutout.java
+++ b/data-access/servlet/src/main/java/webapi/ServletMCutout.java
@@ -97,15 +97,12 @@ public class ServletMCutout extends javax.servlet.http.HttpServlet
OutputStream respOutputStream = response.getOutputStream();
MCutResult result = datasets.doMCutout(reqJsonString);
- // DataLink dlk = new DataLink(mCutRes);
final String contentType = "text/xml"; // FIXME
final String respEncoding = "utf-8"; // FIXME
if(contentType.equals("text/xml") || contentType.equals("application/xml"))
{
- //LOGGER.info("writing xml");
PrintWriter writer = new PrintWriter(new OutputStreamWriter(respOutputStream, respEncoding));
- // XmlSerializer.serializeToLegacyCutResults(writer, respEncoding, dlk, showDuration, startTime_msec);
String accessUrl = convertLocalPathnameToRemoteUrl(result.fileName,
diff --git a/data-access/servlet/src/main/java/webapi/UWSMCutoutWork.java b/data-access/servlet/src/main/java/webapi/UWSMCutoutWork.java
index 14d64c257802ff79bcd90fddd3e2565348a8acfc..3c613df287139ef83512291b3facdb3dcc46dc4b 100644
--- a/data-access/servlet/src/main/java/webapi/UWSMCutoutWork.java
+++ b/data-access/servlet/src/main/java/webapi/UWSMCutoutWork.java
@@ -84,14 +84,11 @@ public class UWSMCutoutWork extends JobThread
/* SODA -> Implementation */
MCutResult mresult = datasets.doMCutout(reqJsonString);
- //DataLink dlk = new DataLink(mCutResults);
/* Implement -> SODA */
PrintWriter writer = new PrintWriter(new OutputStreamWriter(respOutputStream, RESPONSE_ENCODING));
- //XmlSerializer.serializeToLegacyCutResults(writer, RESPONSE_ENCODING, dlk, showDuration, startTime_msec);
-
String accessUrl = convertLocalPathnameToRemoteUrl(mresult.fileName,
settings.fitsPaths.cutouts(),
settings.fitsPaths.cutoutsUrl());
diff --git a/data-access/servlet/src/main/java/webapi/output/DataLink.java b/data-access/servlet/src/main/java/webapi/output/DataLink.java
deleted file mode 100644
index a1bbd2f9341937dcac8e07b00be1f6a9439703ae..0000000000000000000000000000000000000000
--- a/data-access/servlet/src/main/java/webapi/output/DataLink.java
+++ /dev/null
@@ -1,133 +0,0 @@
-
-import java.util.logging.Logger;
-import java.util.List;
-import java.util.ArrayList;
-
-import vo.parameter.*;
-
-class DataLink
-{
- private static final Logger LOGGER = Logger.getLogger("DataLink");
-
- /* DataLink fields */
-
- String id;
- String accessUrl; // MX
- String serviceDef;
- String errorMessage;
- String description; // X
- String semantics;
- String contentType;
- long contentLength; // MX
-
- /* legacy-VLKB fields */
-
- Inputs inputs;
- String versionString;
- String cut;
- String absCutPathname; // ServeltCutout uses
- int datacubeCount;
- NullValueCount nullVals;
- MCutResult.Cut[] mcutResultArr;
-
-
- public DataLink()
- {
- this.nullVals = new NullValueCount();
- this.versionString = Version.asString;
- this.inputs = null;
- this.datacubeCount = 1;
- }
-
-
- // used in ServeltCutout
- public DataLink(Settings settings, CutResult cutResult,
- String id, Pos pos, Band band, Time time, Pol pol, boolean countNullValues)
- {
- this.id = id;
- this.accessUrl = convertLocalPathnameToRemoteUrl(cutResult.fileName,
- settings.fitsPaths.cutouts(), settings.fitsPaths.cutoutsUrl());
- this.serviceDef = null;
- this.errorMessage = null;
- this.description = "A cutout from " + id;
- // + " by parameters "
- // + pos.toString() + " " + band.toString() + " " + time.toString() + " " + pol.toString();
- this.semantics = "http://www.ivoa.net/rdf/datalink/core#proc#cutout";
- this.contentType = "application/fits";
- this.contentLength = cutResult.fileSize;
-
- // VLKB-extension to DataLink:
- Coord coord = new Coord(pos, band, time, pol, null);
- LOGGER.info(coord.toString());
-
- this.inputs = new Inputs(id, coord, countNullValues);
- this.versionString = Version.asString;
- this.cut = null;
- this.absCutPathname = cutResult.fileName;
- this.datacubeCount = 1;
- this.nullVals = ((cutResult.nullValueCount.percent < 0) || (cutResult.nullValueCount.totalCount < 1)) ?
- null : cutResult.nullValueCount;
- this.mcutResultArr = null;
- }
-
- // FIXME fake, only to compile MCutout and Merge
- public DataLink(CutResult cutResult)
- {
- this.nullVals = new NullValueCount();
-
- this.id = "_PIXEL_BOUNDS";
- this.accessUrl = cutResult.fileName; // FIXME fileName ->> remoteUrl
- this.serviceDef = null;
- this.errorMessage = null;
- this.description = "cutout_from ID";
- this.semantics = "FIXME find in IVOA docs...";
- this.contentType = "application/fits";
- this.contentLength = cutResult.fileSize;
-
- // VLKB-extension to DataLink:
- this.inputs = null;
- this.versionString = Version.asString;
- this.cut = null;
- this.absCutPathname = cutResult.fileName;
- this.datacubeCount = 1;
- this.nullVals = cutResult.nullValueCount;
- this.mcutResultArr = null;
- }
-
-
- // used in MCutout
- public DataLink(MCutResult cutResult)
- {
- this.nullVals = new NullValueCount();
-
- this.id = "_PIXEL_BOUNDS";
- this.accessUrl = cutResult.fileName; // FIXME fileName ->> remoteUrl
- this.serviceDef = null;
- this.errorMessage = null;
- this.description = "cutout_from ID";
- this.semantics = "FIXME find in IVOA docs...";
- this.contentType = "application/fits";
- this.contentLength = cutResult.fileSize;
-
- // VLKB-extension to DataLink:
- this.inputs = null;
- this.versionString = Version.asString;
- this.cut = null;
- this.absCutPathname = cutResult.fileName;
- this.datacubeCount = 1;
- this.nullVals = null;
- this.mcutResultArr = cutResult.cutResArr;
- }
-
-
- public String convertLocalPathnameToRemoteUrl(String localPathname, String FITScutpath, String FITSRemoteUrlCutouts)
- {
- String fileName = localPathname.replaceAll(FITScutpath + "/", "");
- LOGGER.info("local filename: " + fileName);
- String remotefname = FITSRemoteUrlCutouts + "/" + fileName;
- LOGGER.info("remote url : " + remotefname);
- return remotefname;
- }
-
-}
-
diff --git a/data-access/servlet/src/main/java/webapi/output/XmlSerializer.java b/data-access/servlet/src/main/java/webapi/output/XmlSerializer.java
index 56447ae0f51e80b09830a075d9a77dfefd24468d..cc933cd95c81cf593b479e59f8009250d0b496f4 100644
--- a/data-access/servlet/src/main/java/webapi/output/XmlSerializer.java
+++ b/data-access/servlet/src/main/java/webapi/output/XmlSerializer.java
@@ -10,38 +10,6 @@ public final class XmlSerializer
private XmlSerializer() {} // disables instatiation
-
-/* public static void serializeToLegacyCutResults(PrintWriter writer, String charEncoding, DataLink dataLink,
- boolean showDuration, long startTime_msec)
- {
- LOGGER.info("trace");
-
- writer.println("<?xml version=\"1.0\" encoding=\"" + charEncoding + "\" standalone=\"yes\"?>");
- writer.println("<results>");
- writer.println("<description> " + dataLink.description + " </description>");
- serialize(writer, dataLink.inputs);
-
- if(dataLink.cut != null)
- writer.println("<CUT> " + dataLink.cut + " </CUT>");
- if(dataLink.accessUrl != null)
- {
- writer.println("<URL> " + dataLink.accessUrl + " </URL>");
- writer.println("<cutoutSize> " + dataLink.contentLength + " </cutoutSize>");
- }
- if(dataLink.nullVals != null)
- writer.println(serialize(dataLink.nullVals ));
-
- writer.println("<msg> " + dataLink.versionString + " </msg>");
-
- writer.println("<DatacubeCount> " + dataLink.datacubeCount + " </DatacubeCount>");
-
- if(showDuration)
- writer.println("<duration unit=\"msec\">"+(System.currentTimeMillis() - startTime_msec)+"</duration>");
-
- writer.println("</results>");
- }
-*/
-
public static void serializeToLegacyCutResult(PrintWriter writer, String charEncoding,
CutResult cutResult, String accessUrl,
String id, Pos pos, Band band, Time time, Pol pol, String pixels, boolean countNullValues,