From f0cae04b19dff949c835d29b08d1672551db6180 Mon Sep 17 00:00:00 2001
From: cdtank <cdtank"@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 12 May 2011 21:28:47 +0000
Subject: [PATCH] 1. Fix for misbehaving VOs for science maps vis.

---
 .../mapofscience/MapOfScienceVisualizationRequestHandler.java | 4 ++--
 .../webapp/visualization/visutils/SelectOnModelUtilities.java | 2 ++
 2 files changed, 4 insertions(+), 2 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 d88702cd..d02f09eb 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
@@ -106,7 +106,7 @@ public class MapOfScienceVisualizationRequestHandler implements
 		Map<String, Activity> documentURIForAssociatedPeopleTOVO = new HashMap<String, Activity>();
 		Map<String, Activity> allDocumentURIToVOs = new HashMap<String, Activity>();
 		
-		allDocumentURIToVOs = SelectOnModelUtilities.getPublicationsForAllSubOrganizations(dataset, organizationEntity);
+		allDocumentURIToVOs = SelectOnModelUtilities.getPublicationsWithJournalForAllSubOrganizations(dataset, organizationEntity);
 		
 		Entity organizationWithAssociatedPeople = SelectOnModelUtilities
 				.getSubjectOrganizationAssociatedPeople(dataset, subjectEntityURI);
@@ -114,7 +114,7 @@ public class MapOfScienceVisualizationRequestHandler implements
 		if (organizationWithAssociatedPeople.getSubEntities() !=  null) {
 			
 			documentURIForAssociatedPeopleTOVO = SelectOnModelUtilities
-						.getPublicationsForAssociatedPeople(dataset, organizationWithAssociatedPeople.getSubEntities());
+						.getPublicationsWithJournalForAssociatedPeople(dataset, organizationWithAssociatedPeople.getSubEntities());
 			
 			organizationEntity = OrganizationUtilityFunctions.mergeEntityIfShareSameURI(
 										organizationEntity,
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 8738f8ad..622b8d90 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/visutils/SelectOnModelUtilities.java
@@ -454,6 +454,8 @@ public class SelectOnModelUtilities {
 				}
 			}
 			currentEntityPublications.add(biboDocument);
+			
+			System.out.println(biboDocument.getClass() + " -- " + ((MapOfScienceActivity) biboDocument).getPublishedInJournal());
 		}
 		subEntity.addActivities(currentEntityPublications);
 	}