From 46f099162aa21cd866be82112f8bafbcecdf8b32 Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Tue, 31 May 2016 20:42:30 +0100
Subject: [PATCH] [VIVO-1235] Fix temporal graph CSV save all missing data

---
 ...apOfScienceVisualizationRequestHandler.java |  2 +-
 ...mporalGrantVisualizationRequestHandler.java |  2 +-
 ...PublicationVisualizationRequestHandler.java | 18 +++++++++++++++++-
 .../visualization/utilities/OrgUtils.java      |  2 +-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
index 80d7a029..e633e6ac 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
@@ -261,7 +261,7 @@ public class MapOfScienceVisualizationRequestHandler implements VisualizationReq
 
 		Map<String, Set<String>> subOrgPublicationsMap = new HashMap<String, Set<String>>();
 
-		OrgUtils.getObjectMappingsForOrgAnSubOrgs(
+		OrgUtils.getObjectMappingsForOrgAndSubOrgs(
 				subjectEntityURI,
 				orgPublications,
 				orgPublicationsPeople,
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java
index 3c470578..b8a517a0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java
@@ -163,7 +163,7 @@ public class TemporalGrantVisualizationRequestHandler implements
 
 		Map<String, Set<String>> subOrgGrantsMap = new HashMap<String, Set<String>>();
 
-		OrgUtils.getObjectMappingsForOrgAnSubOrgs(
+		OrgUtils.getObjectMappingsForOrgAndSubOrgs(
 				subjectEntityURI,
 				orgGrants,
 				orgGrantsPeople,
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java
index 7ce283b5..a11320ef 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java
@@ -100,7 +100,7 @@ public class TemporalPublicationVisualizationRequestHandler implements
 
 		Map<String, Set<String>> subOrgPublicationsMap = new HashMap<String, Set<String>>();
 
-		OrgUtils.getObjectMappingsForOrgAnSubOrgs(
+		OrgUtils.getObjectMappingsForOrgAndSubOrgs(
 				subjectEntityURI,
 				orgPublications,
 				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";
 				fileData.put(DataVisualizationController.FILE_NAME_KEY, outputFileName);
 				fileData.put(DataVisualizationController.FILE_CONTENT_TYPE_KEY, "application/octet-stream");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/OrgUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/OrgUtils.java
index e90f6386..e052ecc4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/OrgUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/OrgUtils.java
@@ -25,7 +25,7 @@ public class OrgUtils {
         return parentURIsToLabel;
     }
 
-    public static void getObjectMappingsForOrgAnSubOrgs(
+    public static void getObjectMappingsForOrgAndSubOrgs(
             String orgUri,
             Set<String> orgObjects,
             Set<String> orgObjectsIncludesPeople,