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

Add about map of science page support

Browse source
This commit is contained in:
kongchinhua 2012-07-03 17:50:44 +00:00
parent 5850ca3e9e
commit 03be80f58a
5 changed files with 53 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/edu/cornell/mannlib/vitro/webapp/controller/visualization/ShortURLVisualizationController.java
View file

@ -108,20 +108,16 @@ public class ShortURLVisualizationController extends FreemarkerHttpServlet {
errorMessage,
vitroRequest);
}
Dataset dataset = setupJENADataSource(vitroRequest);
Dataset dataset = setupJENADataSource(vitroRequest);
if (dataset != null && visRequestHandler != null) {
try {
List<String> matchedPatternGroups = extractShortURLParameters(vitroRequest);
Map<String, String> parametersForVis = getParamatersForVis(matchedPatternGroups, vitroRequest);
return visRequestHandler.generateVisualizationForShortURLRequests(
parametersForVis,
vitroRequest,
@ -145,8 +141,6 @@ public class ShortURLVisualizationController extends FreemarkerHttpServlet {
return UtilityFunctions.handleMalformedParameters("Visualization Query Error",
errorMessage,
vitroRequest);
}
}

14
src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
View file

@ -61,12 +61,18 @@ public class MapOfScienceVisualizationRequestHandler implements
Map<String, String> parameters, VitroRequest vitroRequest, Log log,
Dataset dataset) throws MalformedQueryParametersException {
return generateStandardVisualizationForScienceMapVis(
vitroRequest, log, dataset, parameters.get(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY));
if (vitroRequest.getRequestURI().endsWith("/about")) {
return generateAboutScienceMapVisPage();
} else {
return generateStandardVisualizationForScienceMapVis(
vitroRequest, log, dataset, parameters.get(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY));
}
}
private ResponseValues generateAboutScienceMapVisPage() {
return new TemplateResponseValues("aboutMapOfScience.ftl");
}
private ResponseValues generateStandardVisualizationForScienceMapVis(
VitroRequest vitroRequest, Log log, Dataset dataset,
String entityURI) throws MalformedQueryParametersException {