Skip to content
Snippets Groups Projects
Commit 47d36bfb authored by gmantele's avatar gmantele
Browse files

[TAP] Fix the unit of the execution duration in /capabilities.

Execution duration should be expressed in seconds in this TAP endpoint,
but the TAP Library was returning its internal value which is expressed in
milliseconds.
parent 83d4a319
No related branches found
No related tags found
No related merge requests found
...@@ -30,6 +30,7 @@ import javax.servlet.ServletException; ...@@ -30,6 +30,7 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import adql.db.FunctionDef;
import tap.ServiceConnection; import tap.ServiceConnection;
import tap.ServiceConnection.LimitUnit; import tap.ServiceConnection.LimitUnit;
import tap.TAPException; import tap.TAPException;
...@@ -45,7 +46,6 @@ import uws.service.UWS; ...@@ -45,7 +46,6 @@ import uws.service.UWS;
import uws.service.UWSService; import uws.service.UWSService;
import uws.service.error.ServiceErrorWriter; import uws.service.error.ServiceErrorWriter;
import uws.service.log.UWSLog.LogLevel; import uws.service.log.UWSLog.LogLevel;
import adql.db.FunctionDef;
/** /**
* <p>Root/Home of the TAP service. It is also the resource (HOME) which gathers all the others of the same TAP service.</p> * <p>Root/Home of the TAP service. It is also the resource (HOME) which gathers all the others of the same TAP service.</p>
...@@ -53,7 +53,7 @@ import adql.db.FunctionDef; ...@@ -53,7 +53,7 @@ import adql.db.FunctionDef;
* <p>At its creation it is creating and configuring the other resources in function of the given description of the TAP service.</p> * <p>At its creation it is creating and configuring the other resources in function of the given description of the TAP service.</p>
* *
* @author Gr&eacute;gory Mantelet (CDS;ARI) * @author Gr&eacute;gory Mantelet (CDS;ARI)
* @version 2.1 (01/2016) * @version 2.1 (08/2016)
*/ */
public class TAP implements VOSIResource { public class TAP implements VOSIResource {
...@@ -565,9 +565,9 @@ public class TAP implements VOSIResource { ...@@ -565,9 +565,9 @@ public class TAP implements VOSIResource {
if (executionDuration[0] > -1 || executionDuration[1] > -1){ if (executionDuration[0] > -1 || executionDuration[1] > -1){
xml.append("\t<executionDuration>\n"); xml.append("\t<executionDuration>\n");
if (executionDuration[0] > -1) if (executionDuration[0] > -1)
xml.append("\t\t<default>").append(executionDuration[0]).append("</default>\n"); xml.append("\t\t<default>").append(executionDuration[0] / 1000).append("</default>\n");
if (executionDuration[1] > -1) if (executionDuration[1] > -1)
xml.append("\t\t<hard>").append(executionDuration[1]).append("</hard>\n"); xml.append("\t\t<hard>").append(executionDuration[1] / 1000).append("</hard>\n");
xml.append("\t</executionDuration>\n"); xml.append("\t</executionDuration>\n");
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment