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

NIHVIVO-1261 Pass the ServletContext down the chain to FileServingHelper, to prepare for the change in ConfigurationProperties.

Browse source
This commit is contained in:
jeb228 2011-02-24 17:52:30 +00:00
parent a8974ded16
commit a4223e7ac6
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/utilities/UtilitiesRequestHandler.java
View file

@ -108,7 +108,7 @@ public class UtilitiesRequestHandler implements VisualizationRequestHandler {
Dataset, log); Dataset, log);
return getThumbnailInformation(imageQueryHandler.getQueryResult(), return getThumbnailInformation(imageQueryHandler.getQueryResult(),
fieldLabelToOutputFieldLabel); fieldLabelToOutputFieldLabel, vitroRequest);
} else if (VisualizationFrameworkConstants.ARE_PUBLICATIONS_AVAILABLE_UTILS_VIS_MODE } else if (VisualizationFrameworkConstants.ARE_PUBLICATIONS_AVAILABLE_UTILS_VIS_MODE
.equalsIgnoreCase(visMode)) { .equalsIgnoreCase(visMode)) {
@ -370,7 +370,8 @@ public class UtilitiesRequestHandler implements VisualizationRequestHandler {
private String getThumbnailInformation(ResultSet resultSet, private String getThumbnailInformation(ResultSet resultSet,
Map<String, String> fieldLabelToOutputFieldLabel) { Map<String, String> fieldLabelToOutputFieldLabel,
VitroRequest vitroRequest) {
String finalThumbNailLocation = ""; String finalThumbNailLocation = "";
@ -387,7 +388,8 @@ public class UtilitiesRequestHandler implements VisualizationRequestHandler {
finalThumbNailLocation = finalThumbNailLocation =
FileServingHelper FileServingHelper
.getBytestreamAliasUrl(downloadLocationNode.toString(), .getBytestreamAliasUrl(downloadLocationNode.toString(),
fileNameNode.toString()); fileNameNode.toString(),
vitroRequest.getSession().getServletContext());
} }
} }
return finalThumbNailLocation; return finalThumbNailLocation;