Commit 81b932bd authored by gmantele's avatar gmantele
Browse files

[TAP] Make valid the /capabilities document

parent 7f5f1992

src/tap/resource/Capabilities.java

+2 −2
Original line number Diff line number Diff line
@@ -118,11 +118,11 @@ public class Capabilities implements TAPResource, VOSIResource { 
		// Write the XML document header:

		out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");

		out.print("<vosi:capabilities xmlns:vosi=\"http://www.ivoa.net/xml/VOSICapabilities/v1.0\"");

		out.print(" xmlns:tr=\"http://www.ivoa.net/xml/TAP/v0.1\"");

		out.print(" xmlns:tr=\"http://www.ivoa.net/xml/TAPRegExt/v1.0\"");

		out.print(" xmlns:vr=\"http://www.ivoa.net/xml/VOResource/v1.0\"");

		out.print(" xmlns:vs=\"http://www.ivoa.net/xml/VODataService/v1.0\"");

		out.print(" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"");

		out.println(" xsi:schemaLocation=\"http://www.ivoa.net/xml/TAP/v0.1 http://www.ivoa.net/xml/TAP/v0.1\">");

		out.println(" xsi:schemaLocation=\"http://www.ivoa.net/xml/VOSICapabilities/v1.0 http://www.ivoa.net/xml/VOSICapabilities/v1.0 http://www.ivoa.net/xml/TAPRegExt/v1.0 http://www.ivoa.net/xml/TAPRegExt/v1.0 http://www.ivoa.net/xml/VOResource/v1.0 http://www.ivoa.net/xml/VOResource/v1.0 http://www.ivoa.net/xml/VODataService/v1.0 http://www.ivoa.net/xml/VODataService/v1.0\">");



		// Write the full list of this TAP capabilities:

		out.print(tap.getCapability());

src/tap/resource/TAP.java

+11 −9
Original line number Diff line number Diff line
@@ -438,6 +438,16 @@ public class TAP implements VOSIResource { 
			xml.append("\t</outputFormat>\n");

		}



		// Write upload methods: INLINE, HTTP, FTP:

		if (service.uploadEnabled()){

			xml.append("\t<uploadMethod ivo-id=\"ivo://ivoa.org/tap/uploadmethods#inline\" />\n");

			xml.append("\t<uploadMethod ivo-id=\"ivo://ivoa.org/tap/uploadmethods#http\" />\n");

			xml.append("\t<uploadMethod ivo-id=\"ivo://ivoa.org/tap/uploadmethods#ftp\" />\n");

			xml.append("\t<uploadMethod ivo-id=\"ivo://ivoa.net/std/TAPRegExt#upload-inline\" />\n");

			xml.append("\t<uploadMethod ivo-id=\"ivo://ivoa.net/std/TAPRegExt#upload-http\" />\n");

			xml.append("\t<uploadMethod ivo-id=\"ivo://ivoa.net/std/TAPRegExt#upload-ftp\" />\n");

		}



		// Retention period (for asynchronous jobs):

		int[] retentionPeriod = service.getRetentionPeriod();

		if (retentionPeriod != null && retentionPeriod.length >= 2){
@@ -478,16 +488,8 @@ public class TAP implements VOSIResource { 
			}

		}



		// Upload capabilities and limits:

		// Upload limits

		if (service.uploadEnabled()){

			// Write upload methods: INLINE, HTTP, FTP:

			xml.append("<uploadMethod ivo-id=\"ivo://ivoa.org/tap/uploadmethods#inline\" />");

			xml.append("<uploadMethod ivo-id=\"ivo://ivoa.org/tap/uploadmethods#http\" />");

			xml.append("<uploadMethod ivo-id=\"ivo://ivoa.org/tap/uploadmethods#ftp\" />");

			xml.append("<uploadMethod ivo-id=\"ivo://ivoa.net/std/TAPRegExt#upload-inline\" />");

			xml.append("<uploadMethod ivo-id=\"ivo://ivoa.net/std/TAPRegExt#upload-http\" />");

			xml.append("<uploadMethod ivo-id=\"ivo://ivoa.net/std/TAPRegExt#upload-ftp\" />");



			// Write upload limits:

			int[] uploadLimit = service.getUploadLimit();

			LimitUnit[] uploadLimitType = service.getUploadLimitType();