Commit 35594371 authored by Robert Butora's avatar Robert Butora
Browse files

vosi: fixes /capabilities and service-descriptor

parent cdc040e3

data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java

+0 −2
Original line number Diff line number Diff line
@@ -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>"

data-access/servlet/src/main/java/vosi/VlkbServletFile.java

+6 −6
Original line number Diff line number Diff line
@@ -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);	



			}