Mercurial > dive4elements > river
diff flys-client/src/main/java/de/intevation/flys/client/server/MapPrintServiceImpl.java @ 5720:aa1a43f5c03a
Send errors as plaintext and not as pdf documents
author | Andre Heinecke <aheinecke@intevation.de> |
---|---|
date | Mon, 15 Apr 2013 18:32:37 +0200 |
parents | c4162d8378a1 |
children | b6f8fd50269b |
line wrap: on
line diff
--- a/flys-client/src/main/java/de/intevation/flys/client/server/MapPrintServiceImpl.java Mon Apr 15 18:27:37 2013 +0200 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/MapPrintServiceImpl.java Mon Apr 15 18:32:37 2013 +0200 @@ -427,10 +427,22 @@ try { byte [] buf = new byte[4096]; int r; - resp.setHeader("Content-Disposition", - "attachment;filename=flys-karte.pdf"); - resp.setContentType("application/pdf"); + boolean checkedErrors = false; while ((r = in.read(buf)) >= 0) { + if (!checkedErrors) { + checkedErrors = true; + String header = new String(buf, "UTF-8"); + if (header.contains("Error while generating PDF:")) { + resp.setContentType("text/plain"); + } else { + // Only send content disposition and filename content + // type when we have a pdf + resp.setHeader("Content-Disposition", + "attachment;filename=flys-karte.pdf"); + resp.setContentType("application/pdf"); + } + + } out.write(buf, 0, r); } out.flush();