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

more refactoring for multiple profile view support

Browse source
This commit is contained in:
tworrall 2013-02-08 16:18:01 -05:00
parent 0faa3630c2
commit 867370adb9
26 changed files with 542 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/edu/cornell/mannlib/vitro/webapp/controller/visualization/VisualizationFrameworkConstants.java
View file

@ -53,6 +53,7 @@ public class VisualizationFrameworkConstants {
public static final String VIS_MODE_KEY = "vis_mode";
public static final String RENDER_MODE_KEY = "render_mode";
public static final String OUTPUT_FORMAT_KEY = "output";
public static final String REQUESTING_TEMPLATE_KEY = "template"; /* tlw72 - added in 1.6 for multi-view support */
/*
* These values represent possible render modes.

12
src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java
View file

@ -59,6 +59,13 @@ VisualizationRequestHandler {
.getParameter(
VisualizationFrameworkConstants.VIS_CONTAINER_KEY);
/* tlw72 -- Added in 1.6 for multi-view support. There are now two different "sparkline" templates */
/* and the one that gets loaded depends on which foaf person template is being used by the app. The */
/* personPublicationCountDynamicActivator.ftl template needs to know which is the requesting template. */
String requestingTemplate = vitroRequest
.getParameter(
VisualizationFrameworkConstants.REQUESTING_TEMPLATE_KEY);
QueryRunner<Set<Activity>> queryManager = new PersonPublicationCountQueryRunner(
personURI,
dataset,
@ -91,7 +98,7 @@ VisualizationRequestHandler {
SparklineData sparklineData = visualizationCodeGenerator.getValueObjectContainer();
return prepareDynamicResponse(vitroRequest, sparklineData,
shouldVIVOrenderVis);
shouldVIVOrenderVis, requestingTemplate);
}
@ -273,13 +280,14 @@ VisualizationRequestHandler {
* @return
*/
private TemplateResponseValues prepareDynamicResponse(VitroRequest vreq,
SparklineData valueObjectContainer, boolean shouldVIVOrenderVis) {
SparklineData valueObjectContainer, boolean shouldVIVOrenderVis, String requestingTemplate) {
String dynamicTemplate = "personPublicationCountDynamicActivator.ftl";
Map<String, Object> body = new HashMap<String, Object>();
body.put("sparklineVO", valueObjectContainer);
body.put("shouldVIVOrenderVis", shouldVIVOrenderVis);
body.put("requestingTemplate", requestingTemplate); /* tlw72 -- Added in 1.6 for multi-view support.*/
return new TemplateResponseValues(dynamicTemplate, body);