diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/TestJava.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/TestJava.java index 857a1fba8..6dade7988 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/TestJava.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/TestJava.java @@ -49,7 +49,7 @@ public class TestJava { System.out.println(sampleBlurns); for (String blurb : sampleBlurns) { -// System.out.println(blurb.substring(0, 10)); + System.out.println(blurb.contains("author")); } Map yearToPublicationCount = new TreeMap(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisualizationCodeGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisualizationCodeGenerator.java index 6bb6abbbd..fb70f99ec 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisualizationCodeGenerator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisualizationCodeGenerator.java @@ -518,9 +518,14 @@ public class VisualizationCodeGenerator { if (yearToUniqueCoauthorsCount.size() > 0) { - + String secondaryContextPath = ""; + if (!contextPath.contains("/admin/visQuery")) { + secondaryContextPath = "/admin/visQuery"; + } + + String downloadURL = contextPath -// + "/admin/visQuery" + + secondaryContextPath + "?" + VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE + "=" + URLEncoder.encode(individualURIParam, VisualizationController.URL_ENCODING_SCHEME).toString() @@ -554,8 +559,13 @@ public class VisualizationCodeGenerator { String fullTimelineLink; if (yearToUniqueCoauthorsCount.size() > 0) { + String secondaryContextPath = ""; + if (!contextPath.contains("/admin/visQuery")) { + secondaryContextPath = "/admin/visQuery"; + } + String fullTimelineNetworkURL = contextPath - + "/admin/visQuery" + + secondaryContextPath + "?" + VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE + "=" + URLEncoder.encode(individualURIParam, diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java index 1e8473da6..ad113c2ea 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java @@ -152,7 +152,7 @@ public class VisualizationCodeGenerator { "table.sparkline_wrapper_table td, th {" + " vertical-align: bottom;" + "}" + - ".vis_link {" + + ".vis_link a{" + " padding-top: 5px;" + "}" + "td.sparkline_number { text-align:right; padding-right:5px; }" + @@ -530,9 +530,14 @@ public class VisualizationCodeGenerator { if (yearToPublicationCount.size() > 0) { - + String secondaryContextPath = ""; + if (!contextPath.contains("/admin/visQuery")) { + secondaryContextPath = "/admin/visQuery"; + } + + String downloadURL = contextPath -// + "/admin/visQuery" + + secondaryContextPath + "?" + VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE + "=" + URLEncoder.encode(individualURIParam, VisualizationController.URL_ENCODING_SCHEME).toString() @@ -561,8 +566,13 @@ public class VisualizationCodeGenerator { String fullTimelineLink; if (yearToPublicationCount.size() > 0) { + String secondaryContextPath = ""; + if (!contextPath.contains("/admin/visQuery")) { + secondaryContextPath = "/admin/visQuery"; + } + String fullTimelineNetworkURL = contextPath - + "/admin/visQuery" + + secondaryContextPath + "?" + VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE + "=" + URLEncoder.encode(individualURIParam, @@ -588,7 +598,7 @@ public class VisualizationCodeGenerator { } - divContextCode.append("

" + fullTimelineLink + "

"); + divContextCode.append("" + fullTimelineLink + ""); } catch (UnsupportedEncodingException e) { e.printStackTrace(); @@ -638,9 +648,6 @@ public class VisualizationCodeGenerator { } dataTable.append("\n" + -// "" + -// "*DNA - Data not available" + -// "\n" + "\n"); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationRequestHandler.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationRequestHandler.java index ee1f056a8..f5da0f583 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationRequestHandler.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationRequestHandler.java @@ -124,13 +124,6 @@ public class VisualizationRequestHandler { log); - System.out.println("ft url - " + valueObjectContainer.getFullTimelineNetworkLink()); - System.out.println("dnld fl - " + valueObjectContainer.getDownloadDataLink()); - System.out.println("table - " + valueObjectContainer.getTable()); - System.out.println("min - " + valueObjectContainer.getEarliestRenderedPublicationYear()); - System.out.println("max - " + valueObjectContainer.getLatestRenderedPublicationYear()); - - /* * This is side-effecting because the response of this method is just to redirect to * a page with visualization on it. diff --git a/webapp/web/templates/entity/sparklineVisualization.jsp b/webapp/web/templates/entity/sparklineVisualization.jsp index a7e1c25ee..3424ac8bb 100644 --- a/webapp/web/templates/entity/sparklineVisualization.jsp +++ b/webapp/web/templates/entity/sparklineVisualization.jsp @@ -60,7 +60,7 @@ - + --%> - +