export_to_pdf #8

Merged
francesco.mangiacrapa merged 84 commits from export_to_pdf into master 2024-06-28 15:17:39 +02:00
3 changed files with 5 additions and 3 deletions
Showing only changes of commit 756694a029 - Show all commits

View File

@ -95,12 +95,13 @@ public class Geoportal_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 alt=\"Geoportal Icon\" src=\"img/icon-globe.gif\"><br />";
newHTML += "<p id=\"title-geo\">Geoportal</p><br />"; newHTML += "<p id=\"title-geo\">Geoportal</p><br />";
newHTML += "<div id=\"inner-content\">"; newHTML += "<div id=\"inner-content\">";
newHTML += "<p style=\"font-size: 18px;\">" + action + "</p>"; newHTML += "<p style=\"font-size: 18px;\">" + action + "</p>";
if (waiting) { if (waiting) {
newHTML += "<img alt=\"D4Science Geoportal Loading...\" src=\"https://data.d4science.org/shub/E_a2Y1N2ZIaUhCVlE5R0JXNjJhVXVsTlNyNVJta2ZKZVFMaG52N2gxZm05VWJOb2RFTVBpa0pyV1hsUlg2WXJSTw==\"><br />"; newHTML += "<img alt=\"D4Science Geoportal Loading...\" src=\"img/loading-gears.gif\"><br />";
} }
newHTML += "<br/><p id=\"message\">" + message + "</p>"; newHTML += "<br/><p id=\"message\">" + message + "</p>";

View File

@ -93,10 +93,11 @@ public class StaticImageController {
FileInputStream fileIS = null; FileInputStream fileIS = null;
try { try {
fileIS = new FileInputStream(new File(realPath)); fileIS = new FileInputStream(new File(realPath));
IOUtils.copy(new FileInputStream(new File(realPath)), os); IOUtils.copy(fileIS, os);
} catch (Exception e) { } catch (Exception e) {
try { try {
fileIS.close(); if(fileIS!=null)
fileIS.close();
} catch (Exception e2) { } catch (Exception e2) {
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB