Commit 624c1457 authored by gmantele's avatar gmantele
Browse files

[TAP] Rename the property 'output_add_formats' into 'output_formats' & Correct... 

[TAP] Rename the property 'output_add_formats' into 'output_formats' & Correct the name of the service description in tap_full.properties.
parent 2b10b133

src/tap/config/TAPConfiguration.java

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public final class TAPConfiguration { 
	public final static int DEFAULT_UPLOAD_MAX_FILE_SIZE = Integer.MAX_VALUE;



	/* OUTPUT KEYS */

	public final static String KEY_OUTPUT_FORMATS = "output_add_formats";

	public final static String KEY_OUTPUT_FORMATS = "output_formats";

	public final static String VALUE_ALL = "ALL";

	public final static String VALUE_VOTABLE = "votable";

	public final static String VALUE_VOT = "vot";

src/tap/config/tap_configuration_file.html

+2 −2
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ 
					<p>The default period MUST be less or equals to the maximum retention period. If this rule is not respected, the default retention period is set immediately

					 to the maximum retention period.</p>

					<p>A negative or null value means there is no restriction on the default retention period: job results will be kept forever. Float values are not allowed.</p>

					<p><em>By default query results are kept forever: default_retention_period=0.</em></p></td>

					<p><em>By default query results are kept forever: <code>default_retention_period=0</code>.</em></p></td>

				<td>86400 <em>(1 day)</em></td>

			</tr>

			<tr class="optional">
@@ -448,7 +448,7 @@ 
			

			<tr><td colspan="5">Output</td></tr>

			<tr class="optional">

				<td class="done">output_add_formats</td>

				<td class="done">output_formats</td>

				<td></td>

				<td>text</td>

				<td>

src/tap/config/tap_full.properties

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#             FULL TAP CONFIGURATION FILE                #

#                                                        #

# TAP Version: 2.0                                       #

# Date: 04 Mars 2015                                     #

# Date: 10 Mars 2015                                     #

# Author: Gregory Mantelet (ARI)                         #

#                                                        #

##########################################################
@@ -43,7 +43,7 @@ provider_name = ARI 


# [OPTIONAL]

# Description of the TAP Service.

tap_description = My TAP Service is so amazing! You should use it with your favorite TAP client.

service_description = My TAP Service is so amazing! You should use it with your favorite TAP client.



############

# DATABASE #
@@ -316,7 +316,7 @@ max_execution_duration = 0 
# tap.ServiceConnection.

# 

# Default: ALL

output_add_formats = ALL

output_formats = ALL



# [OPTIONAL]

# Default limit for the result output.