litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

1. Changed vis architecture to serve 3 type of responses from 3 corresponding url patterns (standard, ajax, data).

Browse source 
2. Removed FileResponseValues type per talks with Rebecca Y. & Nick C.
3. Modified FreemarkerHttpServlet to not handle the removed FileResponseValues.
This commit is contained in:
cdtank 2010-12-16 01:20:24 +00:00
parent b636bf868c
commit dbb07aa152
2 changed files with 1 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
View file

@ -26,7 +26,6 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.FileResponseValues;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ForwardResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ForwardResponseValues;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RdfResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RdfResponseValues;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
@ -154,8 +153,6 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
doForward(vreq, response, values); doForward(vreq, response, values);
} else if (values instanceof RdfResponseValues) { } else if (values instanceof RdfResponseValues) {
doRdf(vreq, response, values); doRdf(vreq, response, values);
} else if (values instanceof FileResponseValues) {
doFile(vreq, response, values);
} }
} catch (ServletException e) { } catch (ServletException e) {
log.error("ServletException in doResponse()", e); log.error("ServletException in doResponse()", e);
@ -243,26 +240,6 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
values.getModel().write( response.getOutputStream(), format ); values.getModel().write( response.getOutputStream(), format );
} }
protected void doFile(HttpServletRequest request, HttpServletResponse response, ResponseValues values)
throws IOException {
String mediaType = values.getContentType().getMediaType();
response.setContentType(mediaType);
Map<String, String> headerKeyToValue = values.getHeader();
for (Map.Entry<String, String> currentHeaderPair : headerKeyToValue.entrySet()) {
response.setHeader(currentHeaderPair.getKey(), currentHeaderPair.getValue());
}
PrintWriter responseWriter = response.getWriter();
String rawFileContent = (String) values.getMap().get("fileContent");
responseWriter.append(rawFileContent);
responseWriter.close();
}
protected void doException(VitroRequest vreq, HttpServletResponse response, ResponseValues values) { protected void doException(VitroRequest vreq, HttpServletResponse response, ResponseValues values) {
// Log the error, and display an error message on the page. // Log the error, and display an error message on the page.
log.error(values.getException(), values.getException()); log.error(values.getException(), values.getException());

37
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/FileResponseValues.java
View file

@ -1,37 +0,0 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import edu.cornell.mannlib.vitro.webapp.web.ContentType;
public class FileResponseValues extends BaseResponseValues {
private String outputFileName;
private String DEFAULT_HEADER_KEY = "Content-Disposition";
private String DEFAULT_HEADER_VALUE_PREFIX = "attachment;filename=";
private final Map<String, Object> map;
public FileResponseValues(ContentType contentType, String outputFileName, Map<String, Object> map) {
super(contentType);
this.outputFileName = outputFileName;
this.map = map;
}
@Override
public Map<String, String> getHeader() {
Map<String, String> headerKeyToValue = new HashMap<String, String>();
headerKeyToValue.put(DEFAULT_HEADER_KEY, DEFAULT_HEADER_VALUE_PREFIX + outputFileName);
return headerKeyToValue;
}
@Override
public Map<String, Object> getMap() {
return Collections.unmodifiableMap(this.map);
}
}