diff --git a/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java b/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java index 4294cc02f9097381d186c5bc645850737b8b1b90..6a9121615fc75a3cdcc3d55844d685f4f4bfb068 100644 --- a/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java +++ b/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java @@ -362,19 +362,19 @@ public class FormatResponseFilter implements Filter StringBuilder sb = new StringBuilder(); - sb.append("POSSYS=" + coord.pos.system.toString()); + //sb.append("POSSYS=" + coord.pos.system.toString()); switch(coord.pos.shape) { case CIRCLE: - sb.append("&POS=" + coord.pos.circle.toString()); + sb.append("POS=" + coord.pos.circle.toString()); break; case RANGE: - sb.append("&POS=" + coord.pos.range.toString()); + sb.append("POS=" + coord.pos.range.toString()); break; case POLYGON: - sb.append("&POS=" + coord.pos.polygon.toString()); + sb.append("POS=" + coord.pos.polygon.toString()); break; default: @@ -384,7 +384,7 @@ public class FormatResponseFilter implements Filter if(coord.band != null) { sb.append("&" + coord.band.toString()); - sb.append("&BANDSYS=" + coord.band.system.toString() ); + //sb.append("&BANDSYS=" + coord.band.system.toString() ); } sb.append("&ID="); // FIXME id-value will be added in FormatResponseFilter diff --git a/data-discovery/src/main/java/vlkb/webapi/SearchServlet.java b/data-discovery/src/main/java/vlkb/webapi/SearchServlet.java index b30d43658a3064dbb27c1cd813ed31a08820a1d0..1b2ca2339ce26ab94ebb5a2d2620a6a6e06d4323 100644 --- a/data-discovery/src/main/java/vlkb/webapi/SearchServlet.java +++ b/data-discovery/src/main/java/vlkb/webapi/SearchServlet.java @@ -91,8 +91,8 @@ public class SearchServlet extends javax.servlet.http.HttpServlet coord.target = SingleStringParam.parseSingleStringParam(params, "TARGET"); coord.format = SingleStringParam.parseSingleStringParam(params, "FORMAT"); - coord.calib = Integer.parseInt(SingleStringParam.parseSingleStringParam(params, "CALIB")); - coord.maxrec = Integer.parseInt(SingleStringParam.parseSingleStringParam(params, "MAXREC")); + // coord.calib = Integer.parseInt(SingleStringParam.parseSingleStringParam(params, "CALIB")); + // coord.maxrec = Integer.parseInt(SingleStringParam.parseSingleStringParam(params, "MAXREC")); // FIXME implement checks (?in vlkb-volib?): 0<= calib <=5 and maxrec >= 0 // FIXME add to SQL-query params starting from fov ... diff --git a/java-libs/lib/vlkb-volib-0.9-SNAPSHOT.jar b/java-libs/lib/vlkb-volib-0.9.0.jar similarity index 58% rename from java-libs/lib/vlkb-volib-0.9-SNAPSHOT.jar rename to java-libs/lib/vlkb-volib-0.9.0.jar index edd31c5773f5ab0d4a04df802e5dbbf951bc0218..7a469173ef91db8367fb58af748e1f668e405fe3 100644 Binary files a/java-libs/lib/vlkb-volib-0.9-SNAPSHOT.jar and b/java-libs/lib/vlkb-volib-0.9.0.jar differ