Mercurial > dive4elements > river
changeset 6105:d79bfbe55417
Explicitly set Content-Type of shapefile upload response message to text/html. See flys/#657.
| author | Christian Lins <christian.lins@intevation.de> |
|---|---|
| date | Mon, 27 May 2013 13:35:08 +0200 |
| parents | 7e40264a1363 |
| children | 776229dd5bf7 |
| files | artifacts/src/main/java/org/dive4elements/river/artifacts/states/HWSBarriersState.java gwt-client/src/main/java/org/dive4elements/river/client/server/FileUploadServiceImpl.java |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/HWSBarriersState.java Sat May 25 21:00:52 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/HWSBarriersState.java Mon May 27 13:35:08 2013 +0200 @@ -219,7 +219,6 @@ } private boolean extractUserShp(File dir) { - // TODO Auto-generated method stub File archive = new File(dir, USER_RGD_ZIP); boolean exists = archive.exists(); logger.debug("Zip file exists: " + exists);
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/FileUploadServiceImpl.java Sat May 25 21:00:52 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/FileUploadServiceImpl.java Mon May 27 13:35:08 2013 +0200 @@ -52,9 +52,10 @@ try { Document result = client.callService(url, "fileupload", request); + resp.setContentType("text/html"); + PrintWriter respWriter = resp.getWriter(); - respWriter.write("<html><link href='FLYS.css' rel='stylesheet' type='text/css'>"); - respWriter.write("<body><div style='font-face: Arial,Verdana,sans-serif; font-size: 11px'>"); + respWriter.write("<html><body><div style='font-face: Arial,Verdana,sans-serif; font-size: 11px'>"); if (result == null) { logger.warn("FileUpload service returned no result.");