projects
/
mir.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8999f07
)
send the proper content-type
author
mh
<mh>
Mon, 8 Apr 2002 01:58:55 +0000
(
01:58
+0000)
committer
mh
<mh>
Mon, 8 Apr 2002 01:58:55 +0000
(
01:58
+0000)
source/mircoders/servlet/ServletModuleImages.java
patch
|
blob
|
history
diff --git
a/source/mircoders/servlet/ServletModuleImages.java
b/source/mircoders/servlet/ServletModuleImages.java
index
0a3a384
..
69e9699
100755
(executable)
--- a/
source/mircoders/servlet/ServletModuleImages.java
+++ b/
source/mircoders/servlet/ServletModuleImages.java
@@
-64,7
+64,11
@@
public class ServletModuleImages extends ServletModuleUploadedMedia
if (idParam!=null && !idParam.equals("")) {
try {
EntityImages entImage =(EntityImages)mainModule.getById(idParam);
if (idParam!=null && !idParam.equals("")) {
try {
EntityImages entImage =(EntityImages)mainModule.getById(idParam);
- res.setContentType("image/jpeg"); // testweise
+ ServletContext ctx =
+ (ServletContext)MirConfig.getPropAsObject("ServletContext");
+ String fName = entImage.getId()+"."
+ +entImage.getMediaType().getValue("name");
+ res.setContentType(ctx.getMimeType(fName));
ServletOutputStream out = res.getOutputStream(); // wichtig, dass vorher kein res.getwriter() gelaufen ist
byte[] outbytes = entImage.getImage();
ServletOutputStream out = res.getOutputStream(); // wichtig, dass vorher kein res.getwriter() gelaufen ist
byte[] outbytes = entImage.getImage();
@@
-87,7
+91,11
@@
public class ServletModuleImages extends ServletModuleUploadedMedia
if (idParam!=null && !idParam.equals("")) {
try {
EntityImages entImage =(EntityImages)mainModule.getById(idParam);
if (idParam!=null && !idParam.equals("")) {
try {
EntityImages entImage =(EntityImages)mainModule.getById(idParam);
- res.setContentType("image/jpeg"); // testweise
+ ServletContext ctx =
+ (ServletContext)MirConfig.getPropAsObject("ServletContext");
+ String fName = entImage.getId()+"."
+ +entImage.getMediaType().getValue("name");
+ res.setContentType(ctx.getMimeType(fName));
ServletOutputStream out = res.getOutputStream(); // wichtig, dass vorher kein res.getwriter() gelaufen ist
byte[] outbytes = entImage.getIcon();
ServletOutputStream out = res.getOutputStream(); // wichtig, dass vorher kein res.getwriter() gelaufen ist
byte[] outbytes = entImage.getIcon();