diff --git a/productMods/js/visualization/personlevel/person_level.js b/productMods/js/visualization/personlevel/person_level.js index 55a287e4..a0e77d00 100644 --- a/productMods/js/visualization/personlevel/person_level.js +++ b/productMods/js/visualization/personlevel/person_level.js @@ -350,10 +350,11 @@ function renderCoAuthorshipVisualization() { "pluginspage", "http://www.adobe.com/go/getflashplayer" ); } else { // flash is too old or we can't detect the plugin - var alternateContent = 'Alternate HTML content should be placed here. ' + var alternateContent = '

' + 'This content requires the Adobe Flash Player. ' - + 'Get Flash'; + + 'Get Flash

'; document.write(alternateContent); // insert non-flash content + } } \ No newline at end of file diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java index 7dd5a9a6..9c5c0d38 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java @@ -216,6 +216,7 @@ public class CoAuthorshipGraphMLWriter { graphMLContent.append("\n"); graphMLContent.append("\t" + node.getNodeURL() + "\n"); graphMLContent.append("\t" + node.getNodeName() + "\n"); + graphMLContent.append("\t" + node.getNodeName() + "\n"); if (profileURL != null) { graphMLContent.append("\t" + profileURL + "\n"); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisVOContainer.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisVOContainer.java index e39e965f..1d1d02c4 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisVOContainer.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisVOContainer.java @@ -160,6 +160,15 @@ public class VisVOContainer { schemaAttributes.put("attr.name", "name"); schemaAttributes.put("attr.type", "string"); + nodeSchema.add(schemaAttributes); + + schemaAttributes = new LinkedHashMap(); + + schemaAttributes.put("id", "label"); + schemaAttributes.put("for", "node"); + schemaAttributes.put("attr.name", "label"); + schemaAttributes.put("attr.type", "string"); + nodeSchema.add(schemaAttributes); schemaAttributes = new LinkedHashMap(); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisualizationRequestHandler.java index 679f0be1..dca6e0ee 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisualizationRequestHandler.java @@ -197,12 +197,12 @@ public class VisualizationRequestHandler { if (authorNodesAndEdges.getNodes() == null || authorNodesAndEdges.getNodes().size() < 1 ) { - outputFileName = "no-coauthors" + ".csv"; + outputFileName = "no_coauthors-per-year" + ".csv"; } else { outputFileName = UtilityFunctions.slugify(authorNodesAndEdges.getEgoNode().getNodeName()) - + "-coauthors" + ".csv"; + + "_coauthors-per-year" + ".csv"; yearToCoauthors = getCoAuthorsStats(authorNodesAndEdges); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java index d7874de1..75fd4f4c 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/constants/VisConstants.java @@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.visualization.constants; public class VisConstants { - public static final int MAX_NAME_TEXT_LENGTH = 10; + public static final int MAX_NAME_TEXT_LENGTH = 20; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/VisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/VisualizationRequestHandler.java index 33016494..64696f5b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/VisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/VisualizationRequestHandler.java @@ -256,12 +256,12 @@ public class VisualizationRequestHandler { if (coAuthorsipVO.getNodes() == null || coAuthorsipVO.getNodes().size() < 1) { - outputFileName = "no-coauthorship-net" + ".csv"; + outputFileName = "no_coauthor-network.graphml" + ".xml"; } else { outputFileName = UtilityFunctions.slugify(coAuthorsipVO.getEgoNode().getNodeName()) - + "-coauthor-net" + ".xml"; + + "_coauthor-network.graphml" + ".xml"; } @@ -296,12 +296,12 @@ public class VisualizationRequestHandler { if (coAuthorsipVO.getNodes() == null || coAuthorsipVO.getNodes().size() < 1 ) { - outputFileName = "no-coauthors-list" + ".csv"; + outputFileName = "no_coauthors" + ".csv"; } else { outputFileName = UtilityFunctions.slugify(coAuthorsipVO.getEgoNode().getNodeName()) - + "-coauthors-list" + ".csv"; + + "_coauthors" + ".csv"; coAuthorsToCount = getCoAuthorsList(coAuthorsipVO); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationRequestHandler.java index c5982a26..3b1ad949 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationRequestHandler.java @@ -235,10 +235,10 @@ public class VisualizationRequestHandler { * To make sure that null/empty records for author names do not cause any mischief. * */ if (authorName == null) { - authorName = ""; + authorName = "author"; } - String outputFileName = UtilityFunctions.slugify(authorName) + "pub-count-sparkline" + ".csv"; + String outputFileName = UtilityFunctions.slugify(authorName) + "_publications-per-year" + ".csv"; response.setContentType("application/octet-stream"); response.setHeader("Content-Disposition","attachment;filename=" + outputFileName);