diff --git a/data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java b/data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java index ae7ce6ce5c95b3d6449c26d82e7a4d14a204d45e..2d441d6d1f42f20242184d017f8532039d6e9b25 100644 --- a/data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java +++ b/data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java @@ -96,7 +96,6 @@ public class ServletCutout extends HttpServlet + "<VALUES>" + "<OPTION>ICRS</OPTION>" + "<OPTION>GALACTIC</OPTION>" - + "<OPTION>GRID</OPTION>" + "</VALUES>" + "</PARAM>" @@ -105,7 +104,6 @@ public class ServletCutout extends HttpServlet + "<VALUES>" + "<OPTION>WAVE_Barycentric</OPTION>" + "<OPTION>VELO_LSRK</OPTION>" - + "<OPTION>GRID</OPTION>" + "</VALUES>" + "</PARAM>" diff --git a/data-access/servlet/src/main/java/vosi/VlkbServletFile.java b/data-access/servlet/src/main/java/vosi/VlkbServletFile.java index e95e64c3c8f07a25f8be35b7d7fe33ab0677a0d3..76dd47b904a4c1c98226626ab5ce14d776945452 100644 --- a/data-access/servlet/src/main/java/vosi/VlkbServletFile.java +++ b/data-access/servlet/src/main/java/vosi/VlkbServletFile.java @@ -81,7 +81,7 @@ public class VlkbServletFile private String capsStr = null; - protected void SetCapsStr(String URL, String funcName) + protected void SetCapsStr(String URL) { if(URL != null) { @@ -115,19 +115,19 @@ public class VlkbServletFile + " <capability standardID=\"ivo://ivoa.net/std/SODA#sync-1.0\">" + " <interface xsi:type=\"vod:ParamHTTP\" role=\"std\" version=\"1.0\">" + " <accessURL use=\"full\">" - + accessURL + "/" + funcName + + accessURL + "/sync" + " </accessURL>" + " </interface>" + " </capability>" - +/* + " <capability standardID=\"ivo://ivoa.net/std/SODA#async-1.0\">" + " <interface xsi:type=\"vod:ParamHTTP\" role=\"std\" version=\"1.0\">" + " <accessURL use=\"full\">" - + accessURL + "/" + funcName + "_uws/soda_cuts" + + accessURL + "/async/uws" + " </accessURL>" + " </interface>" + " </capability>" - +*/ + "</vosi:capabilities>"; } } @@ -168,7 +168,7 @@ public class VlkbServletFile String fullURL = request.getRequestURL().toString(); String baseURL = fullURL.substring(0,requestURL.lastIndexOf("/")); - SetCapsStr(baseURL, "soda"); + SetCapsStr(baseURL); writer.println(capsStr); }