From 5f9d321d713cf1ae8e456864f99d27ac77a5aea4 Mon Sep 17 00:00:00 2001
From: kongchinhua <kongchinhua@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 7 Nov 2011 19:04:08 +0000
Subject: [PATCH] Change 'Unlocated' text to Unmapped. Disable People
 comparison due to the existing data are not sufficient to create map of
 science. Support save entity table as CSV

---
 .../mapofscience/ComparisonDataTableWidget.js      | 14 ++++++++------
 .../mapOfScience/mapOfScienceSetup.ftl             |  2 +-
 .../mapOfScience/mapOfScienceStandalone.ftl        |  8 ++------
 .../MapOfScienceVisualizationRequestHandler.java   |  6 +++---
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/productMods/js/visualization/mapofscience/ComparisonDataTableWidget.js b/productMods/js/visualization/mapofscience/ComparisonDataTableWidget.js
index 45ee7510..a600dc47 100644
--- a/productMods/js/visualization/mapofscience/ComparisonDataTableWidget.js
+++ b/productMods/js/visualization/mapofscience/ComparisonDataTableWidget.js
@@ -58,8 +58,11 @@ var ComparisonDataTableWidget = Class.extend({
 		/* Create filter */
 		var dom = me.dom;
 		var filter = $('<div class="science-areas-filter">' +
-	    	'<span id="' + dom.firstFilterID + '" class="' + dom.filterOptionClass + ' ' + dom.activeFilterClass + '">Organizations</span> | ' +
-	    	'<span id="' + dom.secondFilterID + '" class="' + dom.filterOptionClass + '">People</span>' +
+	    	'<span id="' + dom.firstFilterID + '" class="' + dom.filterOptionClass + ' ' + dom.activeFilterClass + '">Organizations</span>'+
+	    	/* This is temporary removed due to the person's publications mapping rate is too low to be displayed.
+		    	' | ' +
+		    	'<span id="' + dom.secondFilterID + '" class="' + dom.filterOptionClass + '">People</span>' +
+	    	*/
 	    	'<img class="' + dom.filterInfoIconClass + '" id="comparisonImageIconTwo" src="'+ infoIconUrl +'" alt="information icon" title="" /></div>');
 		me.tableDiv.append(filter);
 		createToolTip($("#comparisonImageIconTwo"), $("#comparisonToolTipTwo").html(), "topLeft");
@@ -199,8 +202,9 @@ var ComparisonDataTableWidget = Class.extend({
 		createToolTip($("#comparisonSearchInfoIcon"), $("#comparisonSearchInfoTooltipText").html(), "topLeft");
 		
 		/* Create csv download button */
-		var csvButton = '<hr class="subtle-hr"/><div id="main-science-areas-table-footer"><a id="csv" href="' +
-						entityMapOfScienceSubDisciplineCSVURL + 
+		console.log(comparisonScienceMapCsvDataUrlPrefix + me.uri);
+		var csvButton = '<hr class="subtle-hr"/><div id="main-science-areas-table-footer"><a href="' +
+						comparisonScienceMapCsvDataUrlPrefix + me.uri +
 						'" class="map-of-science-links">Save All as CSV</a></div>';
 		me.tableDiv.append(csvButton);
 		
@@ -218,12 +222,10 @@ var ComparisonDataTableWidget = Class.extend({
 			
 			$("#comparison-science-areas-th").html("Organization");
 			me.currentSelectedFilter = COMPARISON_TYPE.ORGANIZATION;
-			$("a#csv").attr("href", entityMapOfScienceSubDisciplineCSVURL);
 		} else {
 			
 			$("#comparison-science-areas-th").html("Person");
 			me.currentSelectedFilter = COMPARISON_TYPE.PERSON;
-			$("a#csv").attr("href", entityMapOfScienceDisciplineCSVURL);
 			
 		}
 		
diff --git a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
index 15e8ac99..0563665a 100644
--- a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
+++ b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
@@ -57,7 +57,7 @@ var ENTITY_TYPE = '${entityType}';
 var loadingImageLink = contextPath + "/images/visualization/ajax-loader-indicator.gif";
 var refreshPageImageLink = contextPath + "/images/visualization/refresh-green.png";
 											
-											
+var comparisonScienceMapCsvDataUrlPrefix = "${urls.base}${dataVisualizationURLRoot}?labelField=label&vis=entity_comparison&uri=";
 var entityMapOfScienceDisciplineCSVURL = "${entityMapOfScienceDisciplineCSVURL}";
 var entityMapOfScienceSubDisciplineCSVURL = "${entityMapOfScienceSubDisciplineCSVURL}";											
 
diff --git a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
index 22fc7c3b..30e6ae18 100644
--- a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
+++ b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
@@ -44,7 +44,7 @@ corresponding changes in the included Templates. -->
     <#-- VIEW TYPE FILTER -->
     <div id="view-type-filter" style="display:${viewTypeFilterDisplay};">
     	<input type="radio" name="view-type" value="ENTITY"> Explore ${entityLabel} </input><br>
-		<input type="radio" name="view-type" value="COMPARISON"> Compare organizations (or people) </input><br><br>
+		<input type="radio" name="view-type" value="COMPARISON"> Compare organizations <#--/ people --></input><br><br>
     </div>
     
     <!-- <h3>What do you want to compare?</h3> -->
@@ -61,12 +61,8 @@ mapped <span id="percent-mapped"></span>% of <span id="total-publications"></spa
 		title="" />
 		
 		<div id="download-unlocated-journal-info">
-			<a href="${entityMapOfScienceUnlocatedJournalsCSVURL}">Save Unlocated Journals</a>
+			<a href="${entityMapOfScienceUnlocatedJournalsCSVURL}">Save Unmapped Publications</a>
 		</div>
-		
-		</div>
-
-
 
 </div>
 </div>
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 b34d793e..61f95781 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
@@ -214,7 +214,7 @@ public class MapOfScienceVisualizationRequestHandler implements
 			fileData.put(DataVisualizationController.FILE_CONTENT_KEY, 
 						 getUnlocatedJournalsCSVContent(entity));
 			
-			outputFileName += "_unlocated-journals" + ".csv";
+			outputFileName += "_unmapped-journals" + ".csv";
 			
 		} else {
 			
@@ -561,14 +561,14 @@ public class MapOfScienceVisualizationRequestHandler implements
 
 		StringBuilder csvFileContent = new StringBuilder();
 		
-		csvFileContent.append("Journal, Publication Count\n");
+		csvFileContent.append("Publication Venue, Publication Count\n");
 		
 		PublicationJournalStats stats = extractScienceMappingResultFromActivities(subjectEntity);
 		ScienceMappingResult result = stats.scienceMapping;
 
 		DecimalFormat percentageActivityFormat = new DecimalFormat("#.#");
 		
-		csvFileContent.append(StringEscapeUtils.escapeCsv("No Journal"));
+		csvFileContent.append(StringEscapeUtils.escapeCsv("No Publication Venue Name"));
 		csvFileContent.append(", ");
 		csvFileContent.append(percentageActivityFormat.format(stats.noJournalCount));
 		csvFileContent.append("\n");