From 35594371cead354e7f8f77032af943e02aeb0b14 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Fri, 7 Mar 2025 17:22:46 +0100
Subject: [PATCH] vosi: fixes /capabilities and service-descriptor
---
.../src/main/java/cutout/webapi/ServletCutout.java | 2 --
.../servlet/src/main/java/vosi/VlkbServletFile.java | 12 ++++++------
2 files changed, 6 insertions(+), 8 deletions(-)
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 ae7ce6c..2d441d6 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 e95e64c..76dd47b 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);
}
--
GitLab