gCubeSystem
/
uri-resolver
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated HTML_page

This commit is contained in:
Francesco Mangiacrapa 2024-04-19 17:02:07 +02:00
parent 28b38e36d4
commit 9071847b48
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/gcube/datatransfer/resolver/geoportal/exporter/HTML_Page.java
View File

@ -66,15 +66,15 @@ public class HTML_Page {
newHTML += "<img alt=\"D4Science Logo\" src=\"https://services.d4science.org/image/layout_set_logo?img_id=32727\"><br />"; newHTML += "<img alt=\"D4Science Logo\" src=\"https://services.d4science.org/image/layout_set_logo?img_id=32727\"><br />";
newHTML += "<div id=\"content\">"; newHTML += "<div id=\"content\">";
newHTML += "<img width=\"200px\" alt=\"D4GNA Logo\" src=\"https://data.d4science.org/shub/E_dmhxT0ZReFpXQ1ZXZUp0M2pXUGhtTEZicHNyMGZUVTB4cTkyc2xqMXFSWmo2Q3o4dWl0dTBmY1p1VTdPN29KMQ==\"><br /><br />";
newHTML += "<p style=\"font-size: 18px;\">" + action + "</p>"; newHTML += "<p style=\"font-size: 18px;\">" + action + "</p>";
if (waiting) { if (waiting) {
newHTML += "<img alt=\"D4GNA Logo\" src=\"https://data.d4science.org/shub/E_dmhxT0ZReFpXQ1ZXZUp0M2pXUGhtTEZicHNyMGZUVTB4cTkyc2xqMXFSWmo2Q3o4dWl0dTBmY1p1VTdPN29KMQ==\"><br /><br />";
newHTML += "<img alt=\"D4Science Geoportal Loading...\" src=\"https://data.d4science.org/shub/E_a2Y1N2ZIaUhCVlE5R0JXNjJhVXVsTlNyNVJta2ZKZVFMaG52N2gxZm05VWJOb2RFTVBpa0pyV1hsUlg2WXJSTw==\"><br />"; newHTML += "<img alt=\"D4Science Geoportal Loading...\" src=\"https://data.d4science.org/shub/E_a2Y1N2ZIaUhCVlE5R0JXNjJhVXVsTlNyNVJta2ZKZVFMaG52N2gxZm05VWJOb2RFTVBpa0pyV1hsUlg2WXJSTw==\"><br />";
} }
newHTML += "<br/><p id=\"message\">" + message + "</p>"; newHTML += "<br/><p id=\"message\">" + message + "</p>";
newHTML += "</div>/body></html>"; newHTML += "</div></body></html>";
return newHTML; return newHTML;
} }

7
src/main/java/org/gcube/datatransfer/resolver/services/GeoportalExporter.java
View File

@ -210,7 +210,7 @@ public class GeoportalExporter {
@GET @GET
@Path("/view/{pdfCode}") @Path("/view/{pdfCode}")
@Produces({ MediaType.TEXT_PLAIN }) @Produces({ MediaType.TEXT_PLAIN, MediaType.TEXT_HTML})
public Response viewPDF(@Context HttpServletRequest req, @PathParam(PDF_CODE) String pdfCode) public Response viewPDF(@Context HttpServletRequest req, @PathParam(PDF_CODE) String pdfCode)
throws WebApplicationException { throws WebApplicationException {
@ -221,9 +221,8 @@ public class GeoportalExporter {
LOG.info("FileReference at code {} is {}", pdfCode, fetchedPDF); LOG.info("FileReference at code {} is {}", pdfCode, fetchedPDF);
if (fetchedPDF == null) { if (fetchedPDF == null) {
throw ExceptionManager.notFoundException(req, return Response.status(Status.NOT_FOUND).entity(HTML_Page.getErrorPage("Job not created", "No job found with id "+pdfCode))
GeoportalExporter.class.getSimpleName() + " view with job code " + pdfCode + " not found", .type(MediaType.TEXT_HTML).build();
this.getClass(), helpURI);
} }
try { try {