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

[VIVO-1031] Reduce redundancy in creating grant sparkles

Browse source
This commit is contained in:
grahamtriggs 2015-11-02 18:01:13 +00:00
parent 814d38e114
commit 0f2da7a3d0
2 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java
View file

@ -1,21 +1,29 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils; package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity;
import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration;
import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator; import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator;
public class CoInvestigationData extends CollaborationData { public class CoInvestigationData extends CollaborationData {
private Map<String, Activity> grantMap = new HashMap<>();
public CoInvestigationData(Collaborator egoCollaborator, public CoInvestigationData(Collaborator egoCollaborator,
Set<Collaborator> collaborators, Set<Collaboration> collaborations) { Set<Collaborator> collaborators, Set<Collaboration> collaborations, Map<String, Activity> grantMap) {
super(egoCollaborator, collaborators, collaborations); super(egoCollaborator, collaborators, collaborations);
this.grantMap = grantMap;
} }
public Map<String, Activity> getGrants() {
return grantMap;
}
public Set<Map<String, String>> initializeEdgeSchema() { public Set<Map<String, String>> initializeEdgeSchema() {
Set<Map<String, String>> edgeSchema = new HashSet<Map<String, String>>(); Set<Map<String, String>> edgeSchema = new HashSet<Map<String, String>>();

25
src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java
View file

@ -7,6 +7,7 @@ import java.util.Map;
import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties; import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
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.visutils.CollaborationDataViewHelper; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.CollaborationDataViewHelper;
import org.apache.axis.utils.StringUtils; import org.apache.axis.utils.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -103,19 +104,11 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
VitroRequest vitroRequest, Log log, Dataset dataset, String egoURI, VitroRequest vitroRequest, Log log, Dataset dataset, String egoURI,
String visMode) throws MalformedQueryParametersException { String visMode) throws MalformedQueryParametersException {
if (VisualizationFrameworkConstants.COPI_VIS_MODE.equalsIgnoreCase(visMode)) { if (VisualizationFrameworkConstants.COPI_VIS_MODE.equalsIgnoreCase(visMode)) {
CoPIGrantCountQueryRunner coPIQueryManager = new CoPIGrantCountQueryRunner(egoURI, vitroRequest.getRDFService(), log);
CoInvestigationData coPIData = coPIQueryManager.getQueryResult();
ModelConstructor constructQueryRunner =
new CoPIGrantCountConstructQueryRunner(egoURI, vitroRequest.getRDFService(), log);
Model constructedModel = constructQueryRunner.getConstructedModel();
QueryRunner<CollaborationData> coPIQueryManager =
new CoPIGrantCountQueryRunner(egoURI, vitroRequest.getRDFService(), log);
CollaborationData coPIData = coPIQueryManager.getQueryResult();
/* /*
* grants over time sparkline * grants over time sparkline
*/ */
@ -123,8 +116,10 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
UtilityFunctions UtilityFunctions
.getIndividualLabelFromDAO(vitroRequest, egoURI)); .getIndividualLabelFromDAO(vitroRequest, egoURI));
Map<String, Activity> grantsToURI = SelectOnModelUtilities.getGrantsForPerson(vitroRequest.getRDFService(), person, false); // Map<String, Activity> grantsToURI = SelectOnModelUtilities.getGrantsForPerson(vitroRequest.getRDFService(), person, false);
Map<String, Activity> grantsToURI = coPIData.getGrants();
/* /*
* Create a map from the year to number of grants. Use the Grant's * Create a map from the year to number of grants. Use the Grant's
* parsedGrantYear to populate the data. * parsedGrantYear to populate the data.