From 34d78876f1c2d2a10327e9f2de7a6c6c98691973 Mon Sep 17 00:00:00 2001
From: Schankula Christopher <schankuc@mcmaster.ca>
Date: Wed, 28 Mar 2018 09:38:17 -0400
Subject: [PATCH] remove null output and prettify histogram js
---
tomcat/webapps/Trawl/histogram.jsp | 8 +++-----
.../localhost/Trawl/org/apache/jsp/histogram_jsp.java | 10 ++++------
.../localhost/Trawl/org/apache/jsp/index_jsp.java | 2 +-
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/tomcat/webapps/Trawl/histogram.jsp b/tomcat/webapps/Trawl/histogram.jsp
index db3beba..16c0c76 100644
--- a/tomcat/webapps/Trawl/histogram.jsp
+++ b/tomcat/webapps/Trawl/histogram.jsp
@@ -20,12 +20,10 @@
out.print("var y=[];");
out.print("var x=[];");
for (Integer year: results){
- out.print("y.push("+ histogram.get(year) +");");
- out.print("x.push('"+ year +"');");
+ out.print("\ty.push("+ histogram.get(year) +");\n");
+ out.print("\tx.push('"+ year +"');\n");
}
-
- out.print((String) request.getAttribute("url"));
-
+
%>
var data = [
diff --git a/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/histogram_jsp.java b/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/histogram_jsp.java
index 744cf44..9d7c404 100644
--- a/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/histogram_jsp.java
+++ b/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/histogram_jsp.java
@@ -1,7 +1,7 @@
/*
* Generated by the Jasper component of Apache Tomcat
* Version: Apache Tomcat/9.0.6
- * Generated at: 2018-03-28 13:19:07 UTC
+ * Generated at: 2018-03-28 13:37:40 UTC
* Note: The last modified time of this file was set to
* the last modified time of the source file after
* generation to assist with modification tracking.
@@ -146,12 +146,10 @@ public final class histogram_jsp extends org.apache.jasper.runtime.HttpJspBase
out.print("var y=[];");
out.print("var x=[];");
for (Integer year: results){
- out.print("y.push("+ histogram.get(year) +");");
- out.print("x.push("+ year +");");
+ out.print("\ty.push("+ histogram.get(year) +");\n");
+ out.print("\tx.push('"+ year +"');\n");
}
-
- out.print((String) request.getAttribute("url"));
-
+
out.write("\r\n");
out.write("\r\n");
diff --git a/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/index_jsp.java b/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/index_jsp.java
index 0adee56..6f73300 100644
--- a/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/index_jsp.java
+++ b/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/index_jsp.java
@@ -1,7 +1,7 @@
/*
* Generated by the Jasper component of Apache Tomcat
* Version: Apache Tomcat/9.0.6
- * Generated at: 2018-03-28 13:10:15 UTC
+ * Generated at: 2018-03-28 13:32:09 UTC
* Note: The last modified time of this file was set to
* the last modified time of the source file after
* generation to assist with modification tracking.
--
GitLab