From 0e3ccec947038adf8c0b563e4916dbc97d70d514 Mon Sep 17 00:00:00 2001
From: cdtank <cdtank"@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 12 May 2011 22:19:58 +0000
Subject: [PATCH] 1. Improved the json response structure for the scimaps vis.

---
 ...pOfScienceVisualizationRequestHandler.java | 37 +++++++++++--------
 .../valueobjects/MapOfScienceActivity.java    |  2 +-
 .../visutils/SelectOnModelUtilities.java      |  1 -
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
index d02f09eb..74df403b 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
@@ -2,10 +2,8 @@
 
 package edu.cornell.mannlib.vitro.webapp.visualization.mapofscience;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -29,9 +27,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity;
 import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Entity;
 import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.MapOfScienceActivity;
 import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SubEntity;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.JsonObject;
 import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.MapOfScience;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.json.SubjectEntityJSON;
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.SelectOnModelUtilities;
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
@@ -319,26 +315,35 @@ public class MapOfScienceVisualizationRequestHandler implements
 			
 
 			Map<String, Integer> journalToPublicationCount = new HashMap<String, Integer>();
-			int i = 0;
+			
+			int mappedPublicationCount = 0;
+			int unMappedPublicationCount = 0;
+			
 			for (Activity activity : subentity.getActivities()) {
-				System.out.println(i);
-				System.out.println(activity.getActivityURI());
-				System.out.println(activity.getClass());
-				System.out.println("------");
 				
-				String journalName = ((MapOfScienceActivity) activity).getPublishedInJournal().trim();
-				
-				if (journalToPublicationCount.containsKey(journalName)) {
+				if (StringUtils.isNotBlank(((MapOfScienceActivity) activity).getPublishedInJournal())) {
+					
+					String journalName = ((MapOfScienceActivity) activity).getPublishedInJournal();
+					if (journalToPublicationCount.containsKey(journalName)) {
+						
+						journalToPublicationCount.put(journalName, 
+													  journalToPublicationCount.get(journalName) + 1);
+					} else {
+						
+						journalToPublicationCount.put(journalName, 1);
+					}
+					
+					mappedPublicationCount++;
 					
-					journalToPublicationCount.put(journalName, 
-												  journalToPublicationCount.get(journalName) + 1);
 				} else {
 					
-					journalToPublicationCount.put(journalName, 1);
+					unMappedPublicationCount++;
 				}
-				i++;
+				
 			}
 			
+			entityJson.setPubsMapped(mappedPublicationCount);
+			entityJson.setPubsUnmapped(unMappedPublicationCount);
 			entityJson.setSubdisciplineActivity(journalToPublicationCount);
 			
 			jsonContent.add(entityJson);
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java
index f9705d9a..e65c7654 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/valueobjects/MapOfScienceActivity.java
@@ -3,7 +3,7 @@ package edu.cornell.mannlib.vitro.webapp.visualization.valueobjects;
 
 public class MapOfScienceActivity extends Activity {
 
-	private String publishedInJournal = "NONE";
+	private String publishedInJournal;
 	
 	public MapOfScienceActivity(String activityURI) {
 		super(activityURI);
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java
index 622b8d90..cbc6e297 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java
@@ -455,7 +455,6 @@ public class SelectOnModelUtilities {
 			}
 			currentEntityPublications.add(biboDocument);
 			
-			System.out.println(biboDocument.getClass() + " -- " + ((MapOfScienceActivity) biboDocument).getPublishedInJournal());
 		}
 		subEntity.addActivities(currentEntityPublications);
 	}