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

[VIVO-1672] Fix NullPointer in visualisations (#118)

Browse source
This commit is contained in:
Graham Triggs 2019-02-12 19:20:09 +00:00 • committed by Ben
parent 490ddad8ba
commit 8c7986d7bd
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java
View file

@ -8,6 +8,7 @@ import java.util.Map;
import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoAuthorshipData; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoAuthorshipData;
import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoInvestigationData; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoInvestigationData;
import edu.cornell.mannlib.vitro.webapp.visualization.visutils.CollaborationDataViewHelper; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.CollaborationDataViewHelper;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.jena.query.Dataset; import org.apache.jena.query.Dataset;
@ -74,8 +75,15 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
String visMode = vitroRequest.getParameter( String visMode = vitroRequest.getParameter(
VisualizationFrameworkConstants.VIS_MODE_KEY); VisualizationFrameworkConstants.VIS_MODE_KEY);
return generateStandardVisualizationForPersonLevelVis(vitroRequest, if (!StringUtils.isEmpty(egoURI)) {
log, dataset, egoURI, visMode); return generateStandardVisualizationForPersonLevelVis(vitroRequest,
log, dataset, egoURI, visMode);
} else {
return UtilityFunctions.handleMalformedParameters(
"Visualization Query Error",
"Inappropriate query parameters were submitted.",
vitroRequest);
}
} }
@ -84,12 +92,22 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
Map<String, String> parameters, VitroRequest vitroRequest, Log log, Map<String, String> parameters, VitroRequest vitroRequest, Log log,
Dataset dataset) throws MalformedQueryParametersException { Dataset dataset) throws MalformedQueryParametersException {
return generateStandardVisualizationForPersonLevelVis( String egoURI = parameters.get(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY);
vitroRequest, String visMode = parameters.get(VisualizationFrameworkConstants.VIS_MODE_KEY);
log,
dataset, if (!StringUtils.isEmpty(egoURI)) {
parameters.get(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY), return generateStandardVisualizationForPersonLevelVis(
parameters.get(VisualizationFrameworkConstants.VIS_MODE_KEY)); vitroRequest,
log,
dataset,
egoURI,
visMode);
} else {
return UtilityFunctions.handleMalformedParameters(
"Visualization Query Error",
"Inappropriate query parameters were submitted.",
vitroRequest);
}
} }
private ResponseValues generateStandardVisualizationForPersonLevelVis( private ResponseValues generateStandardVisualizationForPersonLevelVis(