Commit cc493eeb authored by gmantele's avatar gmantele
Browse files

[TAP,UWS] Make valid VOTable results and errors. Some error messages about... 

[TAP,UWS] Make valid VOTable results and errors. Some error messages about expected TAP request parameters have been changed.
parent 59ab920d

src/tap/formatter/VOTableFormat.java

+8 −4
Original line number Diff line number Diff line
@@ -212,7 +212,9 @@ public class VOTableFormat implements OutputFormat { 
		BufferedWriter out = new BufferedWriter(writer);



		// Set the root VOTABLE node:

		out.write("<VOTABLE" + VOSerializer.formatAttribute("version", votVersion.getVersionNumber()) + VOSerializer.formatAttribute("xmlns", votVersion.getXmlNamespace()) + ">");

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

		out.newLine();

		out.write("<VOTABLE" + VOSerializer.formatAttribute("version", votVersion.getVersionNumber()) + VOSerializer.formatAttribute("xmlns", votVersion.getXmlNamespace()) + VOSerializer.formatAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance") + VOSerializer.formatAttribute("xsi:schemaLocation", votVersion.getXmlNamespace() + " " + votVersion.getSchemaLocation()) + ">");

		out.newLine();



		// The RESOURCE note MUST have a type "results":	[REQUIRED]
@@ -234,7 +236,7 @@ public class VOTableFormat implements OutputFormat { 
			Iterator<Map.Entry<String,String>> it = otherInfo.entrySet().iterator();

			while(it.hasNext()){

				Map.Entry<String,String> entry = it.next();

				out.write("<INFO " + VOSerializer.formatAttribute("name", entry.getKey()) + ">" + VOSerializer.formatText(entry.getValue()) + "</INFO>");

				out.write("<INFO " + VOSerializer.formatAttribute("name", entry.getKey()) + VOSerializer.formatAttribute("value", entry.getValue()) + "/>");

				out.newLine();

			}

		}
@@ -304,7 +306,9 @@ public class VOTableFormat implements OutputFormat { 
	 */

	protected void writeHeader(final VOTableVersion votVersion, final TAPExecutionReport execReport, final BufferedWriter out) throws IOException, TAPException{

		// Set the root VOTABLE node:

		out.write("<VOTABLE" + VOSerializer.formatAttribute("version", votVersion.getVersionNumber()) + VOSerializer.formatAttribute("xmlns", votVersion.getXmlNamespace()) + ">");

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

		out.newLine();

		out.write("<VOTABLE" + VOSerializer.formatAttribute("version", votVersion.getVersionNumber()) + VOSerializer.formatAttribute("xmlns", votVersion.getXmlNamespace()) + VOSerializer.formatAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance") + VOSerializer.formatAttribute("xsi:schemaLocation", votVersion.getXmlNamespace() + " " + votVersion.getSchemaLocation()) + ">");

		out.newLine();



		// The RESOURCE note MUST have a type "results":	[REQUIRED]
@@ -324,7 +328,7 @@ public class VOTableFormat implements OutputFormat { 
		// Append the ADQL query at the origin of this result:	[OPTIONAL]

		String adqlQuery = execReport.parameters.getQuery();

		if (adqlQuery != null){

			out.write("<INFO name=\"QUERY\">" + VOSerializer.formatText(adqlQuery) + "</INFO>");

			out.write("<INFO name=\"QUERY\"" + VOSerializer.formatAttribute("value", adqlQuery) + "/>");

			out.newLine();

		}

src/tap/parameters/FormatController.java

+2 −2
Original line number Diff line number Diff line
@@ -86,11 +86,11 @@ public class FormatController implements InputParamController { 
				return getDefault();



			if (service.getOutputFormat(strFormat) == null)

				throw new UWSException(UWSException.BAD_REQUEST, "Unknown value for the job parameter format: \"" + strFormat + "\". It should be " + getAllowedFormats());

				throw new UWSException(UWSException.BAD_REQUEST, "Unknown value for the parameter \"format\": \"" + strFormat + "\". It should be " + getAllowedFormats());

			else

				return strFormat;

		}else

			throw new UWSException(UWSException.INTERNAL_SERVER_ERROR, "Wrong type for the format parameter: class \"" + format.getClass().getName() + "\"! It should be a String.");

			throw new UWSException(UWSException.INTERNAL_SERVER_ERROR, "Wrong type for the parameter \"format\": class \"" + format.getClass().getName() + "\"! It should be a String.");

	}



	/**

src/tap/parameters/MaxRecController.java

+2 −2
Original line number Diff line number Diff line
@@ -103,10 +103,10 @@ public class MaxRecController implements InputParamController { 
			try{

				maxRec = Integer.parseInt(strValue);

			}catch(NumberFormatException nfe){

				throw new UWSException(UWSException.BAD_REQUEST, "Wrong format for the MaxRec parameter: \"" + strValue + "\"! It should be a integer value between " + TAPJob.UNLIMITED_MAX_REC + " and " + maxOutputLimit + " (Default value: " + defaultOutputLimit + ").");

				throw new UWSException(UWSException.BAD_REQUEST, "Wrong format for the parameter \"maxrec\": \"" + strValue + "\"! It should be a integer value between " + TAPJob.UNLIMITED_MAX_REC + " and " + maxOutputLimit + " (Default value: " + defaultOutputLimit + ").");

			}

		}else

			throw new UWSException(UWSException.INTERNAL_SERVER_ERROR, "Wrong type for the MaxRec parameter: class \"" + value.getClass().getName() + "\"! It should be an integer or a string containing only an integer value.");

			throw new UWSException(UWSException.INTERNAL_SERVER_ERROR, "Wrong type for the parameter \"maxrec\": class \"" + value.getClass().getName() + "\"! It should be an integer or a string containing only an integer value.");



		// A negative output limit is considered as an unlimited output limit:

		if (maxRec < TAPJob.UNLIMITED_MAX_REC)

src/tap/parameters/TAPDestructionTimeController.java

+3 −3
Original line number Diff line number Diff line
@@ -148,14 +148,14 @@ public class TAPDestructionTimeController implements InputParamController { 
			try{

				date = UWSJob.dateFormat.parse(strValue);

			}catch(ParseException pe){

				throw new UWSException(UWSException.BAD_REQUEST, pe, "Wrong date format for the destruction time parameter: \"" + strValue + "\"! The format to respect is: " + UWSJob.DEFAULT_DATE_FORMAT);

				throw new UWSException(UWSException.BAD_REQUEST, pe, "Wrong date format for the parameter \"destruction\": \"" + strValue + "\"! The format to respect is: " + UWSJob.DEFAULT_DATE_FORMAT);

			}

		}else

			throw new UWSException(UWSException.INTERNAL_SERVER_ERROR, "Wrong type for the destruction time parameter: class \"" + value.getClass().getName() + "\"! It should be a Date or a string containing a date with the format \"" + UWSJob.DEFAULT_DATE_FORMAT + "\".");

			throw new UWSException(UWSException.INTERNAL_SERVER_ERROR, "Wrong type for the parameter \"destruction\": class \"" + value.getClass().getName() + "\"! It should be a Date or a string containing a date with the format \"" + UWSJob.DEFAULT_DATE_FORMAT + "\".");



		Date maxDate = getMaxDestructionTime();

		if (maxDate != null && date.after(maxDate))

			throw new UWSException(UWSException.BAD_REQUEST, "The TAP service limits the DESTRUCTION INTERVAL (since now) to " + getMaxRetentionPeriod() + " s !");

			throw new UWSException(UWSException.BAD_REQUEST, "The TAP service limits the destruction interval (since now) to " + getMaxRetentionPeriod() + " s !");



		return date;

	}

src/tap/parameters/TAPExecutionDurationController.java

+2 −2
Original line number Diff line number Diff line
@@ -104,10 +104,10 @@ public class TAPExecutionDurationController implements InputParamController { 
			try{

				duration = Long.parseLong((String)value);

			}catch(NumberFormatException nfe){

				throw new UWSException(UWSException.BAD_REQUEST, "Wrong format for the maximum duration parameter: \"" + value.toString() + "\"! It should be a long numeric value between " + TAPJob.UNLIMITED_DURATION + " and " + maxDuration + " (Default value: " + defaultDuration + ").");

				throw new UWSException(UWSException.BAD_REQUEST, "Wrong format for the parameter \"executionduration\": \"" + value.toString() + "\"! It should be a long numeric value between " + TAPJob.UNLIMITED_DURATION + " and " + maxDuration + " (Default value: " + defaultDuration + ").");

			}

		}else

			throw new UWSException(UWSException.INTERNAL_SERVER_ERROR, "Wrong type for the maximum duration parameter: class \"" + value.getClass().getName() + "\"! It should be long or a string containing only a long value.");

			throw new UWSException(UWSException.INTERNAL_SERVER_ERROR, "Wrong type for the parameter \"executionduration\": class \"" + value.getClass().getName() + "\"! It should be long or a string containing only a long value.");



		if (duration < TAPJob.UNLIMITED_DURATION)

			duration = TAPJob.UNLIMITED_DURATION;