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

Merge pull request #32 from vivo-project/committer/grahamtriggs

Browse source 
[VIVO-1235] Fix temporal graph CSV save all missing data
This commit is contained in:
grahamtriggs 2016-05-31 20:47:02 +01:00
commit 2a6f857353
4 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
View file

@ -261,7 +261,7 @@ public class MapOfScienceVisualizationRequestHandler implements VisualizationReq
Map<String, Set<String>> subOrgPublicationsMap = new HashMap<String, Set<String>>(); Map<String, Set<String>> subOrgPublicationsMap = new HashMap<String, Set<String>>();
OrgUtils.getObjectMappingsForOrgAnSubOrgs( OrgUtils.getObjectMappingsForOrgAndSubOrgs(
subjectEntityURI, subjectEntityURI,
orgPublications, orgPublications,
orgPublicationsPeople, orgPublicationsPeople,

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java
View file

@ -163,7 +163,7 @@ public class TemporalGrantVisualizationRequestHandler implements
Map<String, Set<String>> subOrgGrantsMap = new HashMap<String, Set<String>>(); Map<String, Set<String>> subOrgGrantsMap = new HashMap<String, Set<String>>();
OrgUtils.getObjectMappingsForOrgAnSubOrgs( OrgUtils.getObjectMappingsForOrgAndSubOrgs(
subjectEntityURI, subjectEntityURI,
orgGrants, orgGrants,
orgGrantsPeople, orgGrantsPeople,

18
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java
View file

@ -100,7 +100,7 @@ public class TemporalPublicationVisualizationRequestHandler implements
Map<String, Set<String>> subOrgPublicationsMap = new HashMap<String, Set<String>>(); Map<String, Set<String>> subOrgPublicationsMap = new HashMap<String, Set<String>>();
OrgUtils.getObjectMappingsForOrgAnSubOrgs( OrgUtils.getObjectMappingsForOrgAndSubOrgs(
subjectEntityURI, subjectEntityURI,
orgPublications, orgPublications,
orgPublicationsPeople, orgPublicationsPeople,
@ -195,6 +195,22 @@ public class TemporalPublicationVisualizationRequestHandler implements
} }
// For each person
for (String person : orgPublicationsPeople) {
csvFileContent.append(StringEscapeUtils.escapeCsv(personLabelMap.get(person)));
csvFileContent.append(", ");
if (personToPublicationMap.containsKey(person)) {
csvFileContent.append(personToPublicationMap.get(person).size());
csvFileContent.append(", ");
} else {
csvFileContent.append("0, ");
}
csvFileContent.append("Person");
csvFileContent.append("\n");
}
String outputFileName = UtilityFunctions.slugify(entityLabel) + "_publications-per-year" + ".csv"; String outputFileName = UtilityFunctions.slugify(entityLabel) + "_publications-per-year" + ".csv";
fileData.put(DataVisualizationController.FILE_NAME_KEY, outputFileName); fileData.put(DataVisualizationController.FILE_NAME_KEY, outputFileName);
fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream"); fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/OrgUtils.java
View file

@ -25,7 +25,7 @@ public class OrgUtils {
return parentURIsToLabel; return parentURIsToLabel;
} }
public static void getObjectMappingsForOrgAnSubOrgs( public static void getObjectMappingsForOrgAndSubOrgs(
String orgUri, String orgUri,
Set<String> orgObjects, Set<String> orgObjects,
Set<String> orgObjectsIncludesPeople, Set<String> orgObjectsIncludesPeople,