diff --git a/tomcat/webapps/Trawl/histogram.jsp b/tomcat/webapps/Trawl/histogram.jsp
index 43a635e9038a8d057fcc6b01eac8423909929468..e3121761dc2245a488d75908f763bef204afb90c 100644
--- a/tomcat/webapps/Trawl/histogram.jsp
+++ b/tomcat/webapps/Trawl/histogram.jsp
@@ -39,6 +39,7 @@
var layout = {
title: 'Individual count vs Year',
xaxis:{title: 'Year',
+ type: 'category',
titlefont: {
family: 'Courier New, monospace',
size: 18,
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 6f73300ee84ffe31d7212378ded43af9d3d04ed6..f9e1e220d7fcbfd54649810bcd23b760d93af6ae 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,241 +1,241 @@
-/*
- * Generated by the Jasper component of Apache Tomcat
- * Version: Apache Tomcat/9.0.6
- * 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.
- */
-package org.apache.jsp;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import java.util.*;
-
-public final class index_jsp extends org.apache.jasper.runtime.HttpJspBase
- implements org.apache.jasper.runtime.JspSourceDependent,
- org.apache.jasper.runtime.JspSourceImports {
-
- private static final javax.servlet.jsp.JspFactory _jspxFactory =
- javax.servlet.jsp.JspFactory.getDefaultFactory();
-
- private static java.util.Map<java.lang.String,java.lang.Long> _jspx_dependants;
-
- private static final java.util.Set<java.lang.String> _jspx_imports_packages;
-
- private static final java.util.Set<java.lang.String> _jspx_imports_classes;
-
- static {
- _jspx_imports_packages = new java.util.HashSet<>();
- _jspx_imports_packages.add("javax.servlet");
- _jspx_imports_packages.add("java.util");
- _jspx_imports_packages.add("javax.servlet.http");
- _jspx_imports_packages.add("javax.servlet.jsp");
- _jspx_imports_classes = null;
- }
-
- private volatile javax.el.ExpressionFactory _el_expressionfactory;
- private volatile org.apache.tomcat.InstanceManager _jsp_instancemanager;
-
- public java.util.Map<java.lang.String,java.lang.Long> getDependants() {
- return _jspx_dependants;
- }
-
- public java.util.Set<java.lang.String> getPackageImports() {
- return _jspx_imports_packages;
- }
-
- public java.util.Set<java.lang.String> getClassImports() {
- return _jspx_imports_classes;
- }
-
- public javax.el.ExpressionFactory _jsp_getExpressionFactory() {
- if (_el_expressionfactory == null) {
- synchronized (this) {
- if (_el_expressionfactory == null) {
- _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory();
- }
- }
- }
- return _el_expressionfactory;
- }
-
- public org.apache.tomcat.InstanceManager _jsp_getInstanceManager() {
- if (_jsp_instancemanager == null) {
- synchronized (this) {
- if (_jsp_instancemanager == null) {
- _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig());
- }
- }
- }
- return _jsp_instancemanager;
- }
-
- public void _jspInit() {
- }
-
- public void _jspDestroy() {
- }
-
- public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response)
- throws java.io.IOException, javax.servlet.ServletException {
-
- if (!javax.servlet.DispatcherType.ERROR.equals(request.getDispatcherType())) {
- final java.lang.String _jspx_method = request.getMethod();
- if ("OPTIONS".equals(_jspx_method)) {
- response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
- return;
- }
- if (!"GET".equals(_jspx_method) && !"POST".equals(_jspx_method) && !"HEAD".equals(_jspx_method)) {
- response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
- response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "JSPs only permit GET, POST or HEAD. Jasper also permits OPTIONS");
- return;
- }
- }
-
- final javax.servlet.jsp.PageContext pageContext;
- javax.servlet.http.HttpSession session = null;
- final javax.servlet.ServletContext application;
- final javax.servlet.ServletConfig config;
- javax.servlet.jsp.JspWriter out = null;
- final java.lang.Object page = this;
- javax.servlet.jsp.JspWriter _jspx_out = null;
- javax.servlet.jsp.PageContext _jspx_page_context = null;
-
-
- try {
- response.setContentType("text/html");
- pageContext = _jspxFactory.getPageContext(this, request, response,
- null, true, 8192, true);
- _jspx_page_context = pageContext;
- application = pageContext.getServletContext();
- config = pageContext.getServletConfig();
- session = pageContext.getSession();
- out = pageContext.getOut();
- _jspx_out = out;
-
- out.write("\n");
- out.write("<!--\n");
- out.write("Double Handle Slider Modified from: http://jqueryui.com/slider/#range\n");
- out.write("-->\n");
- out.write("\n");
- out.write("<!DOCTYPE html>\n");
- out.write("<html lang=\"en\">\n");
- out.write("<head>\n");
- out.write(" <meta charset=\"UTF-8\">\n");
- out.write(" <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n");
- out.write(" <meta name=\"keywords\" content=\"insert, some, keywords\"> <!--TODO-->\n");
- out.write(" <meta name=\"description\" content=\"insert a description\"> <!--TODO-->\n");
- out.write(" <title>TrawlTool</title>\n");
- out.write(" <link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\">\n");
- out.write("\n");
- out.write("\n");
- out.write(" <!--JQuery-->\n");
- out.write(" <script src=\"https://code.jquery.com/jquery-1.12.4.js\"></script>\n");
- out.write(" <script src=\"https://code.jquery.com/ui/1.12.1/jquery-ui.js\"></script>\n");
- out.write(" <link rel=\"stylesheet\" href=\"//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css\">\n");
- out.write("\n");
- out.write(" <!-- MUST load JQuery Library before loading this-->\n");
- out.write(" <script src=\"script.js\"></script>\n");
- out.write(" <!--Fonts-->\n");
- out.write(" <!--Open Sans Rg-400/Semi-600/Bd-700-->\n");
- out.write(" <link href=\"https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700\" rel=\"stylesheet\">\n");
- out.write("\n");
- out.write(" <!--Plugins-->\n");
- out.write("</head>\n");
- out.write("<body>\n");
- out.write(" <header>\n");
- out.write(" <a href=\"index.html\" >TrawlTool</a>\n");
- out.write(" </header>\n");
- out.write("\n");
- out.write(" <span id=\"menu-bar\">\n");
- out.write(" <a href=\"index.html\">Non functional Menu Item 1</a> |\n");
- out.write(" <a href=\"index.html\" target=\"_blank\">Item 2</a>\n");
- out.write(" </span>\n");
- out.write("\n");
- out.write(" <section id=\"options\">\n");
- out.write(" <section id=\"nameDropdownIn\">\n");
- out.write(" <form method=\"POST\" action=\"doBioLookup.do\"> <!--.do extension is not necessary. This field is the servlet's url in web.xml-->\n");
- out.write(" Phylum:\n");
- out.write(" <select name=\"phylum\" size=\"1\" onChange=\"this.form.submit()\">\n");
- out.write(" <option value=\"0\">Arthropoda</option>\n");
- out.write(" <option>Chordata</option>\n");
- out.write(" <option>Mollusca</option>\n");
- out.write(" </select>\n");
- out.write("\n");
- out.write(" Class:\n");
- out.write(" <select name=\"class\" size=\"1\" onChange=\"alert()\">\n");
- out.write(" <option>SomeClass</option>\n");
- out.write(" </select>\n");
- out.write("\n");
- out.write(" Order:\n");
- out.write(" <select name=\"order\" size=\"1\">\n");
- out.write(" </select>\n");
- out.write("\n");
- out.write(" Family:\n");
- out.write(" <select name=\"family\" size=\"1\">\n");
- out.write(" </select>\n");
- out.write("\n");
- out.write(" Genus:\n");
- out.write(" <select name=\"genus\" size=\"1\">\n");
- out.write(" </select>\n");
- out.write("\n");
- out.write(" Species:\n");
- out.write(" <select name=\"species\" size=\"1\">\n");
- out.write("\n");
- out.write(" </select>\n");
- out.write(" <!--<input type=\"SUBMIT\">-->\n");
- out.write(" </form>\n");
- out.write(" </section>\n");
- out.write("\n");
- out.write(" <section id=\"yearIn\">\n");
- out.write(" Year Range:\n");
- out.write(" <span id=\"fromtoYear\">InnerHtml</span>\n");
- out.write(" <form>\n");
- out.write(" <!--<input type=\"number\" id=\"fromYear\" class=\"yearN\" value=\"2000\" min=\"1960\" max=\"2016\" oninput=\"brightN()\">-->\n");
- out.write(" <div id=\"slider-range\"></div>\n");
- out.write(" </form>\n");
- out.write(" </section>\n");
- out.write("\n");
- out.write(" <section id=\"outputIn\">\n");
- out.write(" <form>\n");
- out.write(" <!--TODO: Set Default button entered-->\n");
- out.write(" <input type=\"radio\" name=\"gender\" value=\"male\"> Map\n");
- out.write(" <input type=\"radio\" name=\"gender\" value=\"female\"> Histogram\n");
- out.write(" <input type=\"submit\">\n");
- out.write(" </form>\n");
- out.write(" <form method=\"POST\" action=\">\n");
- out.write(" <input type=\"submit\" value=\"Individual Records\"> <!--To records.html-->\n");
- out.write(" </form>\n");
- out.write(" </section>\n");
- out.write(" </section>\n");
- out.write("\n");
- out.write(" <section id=\"outputWrapper\">\n");
- out.write(" <section id=\"outputDetails\">Stuff like population count, entries found, etc. go here</section>\n");
- out.write(" <section id=\"outputBox\">Map, Histogram Box</section>\n");
- out.write(" </section>\n");
- out.write(" <footer>\n");
- out.write(" Footer\n");
- out.write(" </footer>\n");
- out.write("</body>\n");
- out.write("</html>\n");
- } catch (java.lang.Throwable t) {
- if (!(t instanceof javax.servlet.jsp.SkipPageException)){
- out = _jspx_out;
- if (out != null && out.getBufferSize() != 0)
- try {
- if (response.isCommitted()) {
- out.flush();
- } else {
- out.clearBuffer();
- }
- } catch (java.io.IOException e) {}
- if (_jspx_page_context != null) _jspx_page_context.handlePageException(t);
- else throw new ServletException(t);
- }
- } finally {
- _jspxFactory.releasePageContext(_jspx_page_context);
- }
- }
-}
+/*
+ * Generated by the Jasper component of Apache Tomcat
+ * Version: Apache Tomcat/9.0.6
+ * 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.
+ */
+package org.apache.jsp;
+
+import javax.servlet.*;
+import javax.servlet.http.*;
+import javax.servlet.jsp.*;
+import java.util.*;
+
+public final class index_jsp extends org.apache.jasper.runtime.HttpJspBase
+ implements org.apache.jasper.runtime.JspSourceDependent,
+ org.apache.jasper.runtime.JspSourceImports {
+
+ private static final javax.servlet.jsp.JspFactory _jspxFactory =
+ javax.servlet.jsp.JspFactory.getDefaultFactory();
+
+ private static java.util.Map<java.lang.String,java.lang.Long> _jspx_dependants;
+
+ private static final java.util.Set<java.lang.String> _jspx_imports_packages;
+
+ private static final java.util.Set<java.lang.String> _jspx_imports_classes;
+
+ static {
+ _jspx_imports_packages = new java.util.HashSet<>();
+ _jspx_imports_packages.add("javax.servlet");
+ _jspx_imports_packages.add("java.util");
+ _jspx_imports_packages.add("javax.servlet.http");
+ _jspx_imports_packages.add("javax.servlet.jsp");
+ _jspx_imports_classes = null;
+ }
+
+ private volatile javax.el.ExpressionFactory _el_expressionfactory;
+ private volatile org.apache.tomcat.InstanceManager _jsp_instancemanager;
+
+ public java.util.Map<java.lang.String,java.lang.Long> getDependants() {
+ return _jspx_dependants;
+ }
+
+ public java.util.Set<java.lang.String> getPackageImports() {
+ return _jspx_imports_packages;
+ }
+
+ public java.util.Set<java.lang.String> getClassImports() {
+ return _jspx_imports_classes;
+ }
+
+ public javax.el.ExpressionFactory _jsp_getExpressionFactory() {
+ if (_el_expressionfactory == null) {
+ synchronized (this) {
+ if (_el_expressionfactory == null) {
+ _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory();
+ }
+ }
+ }
+ return _el_expressionfactory;
+ }
+
+ public org.apache.tomcat.InstanceManager _jsp_getInstanceManager() {
+ if (_jsp_instancemanager == null) {
+ synchronized (this) {
+ if (_jsp_instancemanager == null) {
+ _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig());
+ }
+ }
+ }
+ return _jsp_instancemanager;
+ }
+
+ public void _jspInit() {
+ }
+
+ public void _jspDestroy() {
+ }
+
+ public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response)
+ throws java.io.IOException, javax.servlet.ServletException {
+
+ if (!javax.servlet.DispatcherType.ERROR.equals(request.getDispatcherType())) {
+ final java.lang.String _jspx_method = request.getMethod();
+ if ("OPTIONS".equals(_jspx_method)) {
+ response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
+ return;
+ }
+ if (!"GET".equals(_jspx_method) && !"POST".equals(_jspx_method) && !"HEAD".equals(_jspx_method)) {
+ response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
+ response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "JSPs only permit GET, POST or HEAD. Jasper also permits OPTIONS");
+ return;
+ }
+ }
+
+ final javax.servlet.jsp.PageContext pageContext;
+ javax.servlet.http.HttpSession session = null;
+ final javax.servlet.ServletContext application;
+ final javax.servlet.ServletConfig config;
+ javax.servlet.jsp.JspWriter out = null;
+ final java.lang.Object page = this;
+ javax.servlet.jsp.JspWriter _jspx_out = null;
+ javax.servlet.jsp.PageContext _jspx_page_context = null;
+
+
+ try {
+ response.setContentType("text/html");
+ pageContext = _jspxFactory.getPageContext(this, request, response,
+ null, true, 8192, true);
+ _jspx_page_context = pageContext;
+ application = pageContext.getServletContext();
+ config = pageContext.getServletConfig();
+ session = pageContext.getSession();
+ out = pageContext.getOut();
+ _jspx_out = out;
+
+ out.write("\n");
+ out.write("<!--\n");
+ out.write("Double Handle Slider Modified from: http://jqueryui.com/slider/#range\n");
+ out.write("-->\n");
+ out.write("\n");
+ out.write("<!DOCTYPE html>\n");
+ out.write("<html lang=\"en\">\n");
+ out.write("<head>\n");
+ out.write(" <meta charset=\"UTF-8\">\n");
+ out.write(" <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n");
+ out.write(" <meta name=\"keywords\" content=\"insert, some, keywords\"> <!--TODO-->\n");
+ out.write(" <meta name=\"description\" content=\"insert a description\"> <!--TODO-->\n");
+ out.write(" <title>TrawlTool</title>\n");
+ out.write(" <link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\">\n");
+ out.write("\n");
+ out.write("\n");
+ out.write(" <!--JQuery-->\n");
+ out.write(" <script src=\"https://code.jquery.com/jquery-1.12.4.js\"></script>\n");
+ out.write(" <script src=\"https://code.jquery.com/ui/1.12.1/jquery-ui.js\"></script>\n");
+ out.write(" <link rel=\"stylesheet\" href=\"//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css\">\n");
+ out.write("\n");
+ out.write(" <!-- MUST load JQuery Library before loading this-->\n");
+ out.write(" <script src=\"script.js\"></script>\n");
+ out.write(" <!--Fonts-->\n");
+ out.write(" <!--Open Sans Rg-400/Semi-600/Bd-700-->\n");
+ out.write(" <link href=\"https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700\" rel=\"stylesheet\">\n");
+ out.write("\n");
+ out.write(" <!--Plugins-->\n");
+ out.write("</head>\n");
+ out.write("<body>\n");
+ out.write(" <header>\n");
+ out.write(" <a href=\"index.html\" >TrawlTool</a>\n");
+ out.write(" </header>\n");
+ out.write("\n");
+ out.write(" <span id=\"menu-bar\">\n");
+ out.write(" <a href=\"index.html\">Non functional Menu Item 1</a> |\n");
+ out.write(" <a href=\"index.html\" target=\"_blank\">Item 2</a>\n");
+ out.write(" </span>\n");
+ out.write("\n");
+ out.write(" <section id=\"options\">\n");
+ out.write(" <section id=\"nameDropdownIn\">\n");
+ out.write(" <form method=\"POST\" action=\"doBioLookup.do\"> <!--.do extension is not necessary. This field is the servlet's url in web.xml-->\n");
+ out.write(" Phylum:\n");
+ out.write(" <select name=\"phylum\" size=\"1\" onChange=\"this.form.submit()\">\n");
+ out.write(" <option value=\"0\">Arthropoda</option>\n");
+ out.write(" <option>Chordata</option>\n");
+ out.write(" <option>Mollusca</option>\n");
+ out.write(" </select>\n");
+ out.write("\n");
+ out.write(" Class:\n");
+ out.write(" <select name=\"class\" size=\"1\" onChange=\"alert()\">\n");
+ out.write(" <option>SomeClass</option>\n");
+ out.write(" </select>\n");
+ out.write("\n");
+ out.write(" Order:\n");
+ out.write(" <select name=\"order\" size=\"1\">\n");
+ out.write(" </select>\n");
+ out.write("\n");
+ out.write(" Family:\n");
+ out.write(" <select name=\"family\" size=\"1\">\n");
+ out.write(" </select>\n");
+ out.write("\n");
+ out.write(" Genus:\n");
+ out.write(" <select name=\"genus\" size=\"1\">\n");
+ out.write(" </select>\n");
+ out.write("\n");
+ out.write(" Species:\n");
+ out.write(" <select name=\"species\" size=\"1\">\n");
+ out.write("\n");
+ out.write(" </select>\n");
+ out.write(" <!--<input type=\"SUBMIT\">-->\n");
+ out.write(" </form>\n");
+ out.write(" </section>\n");
+ out.write("\n");
+ out.write(" <section id=\"yearIn\">\n");
+ out.write(" Year Range:\n");
+ out.write(" <span id=\"fromtoYear\">InnerHtml</span>\n");
+ out.write(" <form>\n");
+ out.write(" <!--<input type=\"number\" id=\"fromYear\" class=\"yearN\" value=\"2000\" min=\"1960\" max=\"2016\" oninput=\"brightN()\">-->\n");
+ out.write(" <div id=\"slider-range\"></div>\n");
+ out.write(" </form>\n");
+ out.write(" </section>\n");
+ out.write("\n");
+ out.write(" <section id=\"outputIn\">\n");
+ out.write(" <form>\n");
+ out.write(" <!--TODO: Set Default button entered-->\n");
+ out.write(" <input type=\"radio\" name=\"gender\" value=\"male\"> Map\n");
+ out.write(" <input type=\"radio\" name=\"gender\" value=\"female\"> Histogram\n");
+ out.write(" <input type=\"submit\">\n");
+ out.write(" </form>\n");
+ out.write(" <form method=\"POST\" action=\">\n");
+ out.write(" <input type=\"submit\" value=\"Individual Records\"> <!--To records.html-->\n");
+ out.write(" </form>\n");
+ out.write(" </section>\n");
+ out.write(" </section>\n");
+ out.write("\n");
+ out.write(" <section id=\"outputWrapper\">\n");
+ out.write(" <section id=\"outputDetails\">Stuff like population count, entries found, etc. go here</section>\n");
+ out.write(" <section id=\"outputBox\">Map, Histogram Box</section>\n");
+ out.write(" </section>\n");
+ out.write(" <footer>\n");
+ out.write(" Footer\n");
+ out.write(" </footer>\n");
+ out.write("</body>\n");
+ out.write("</html>\n");
+ } catch (java.lang.Throwable t) {
+ if (!(t instanceof javax.servlet.jsp.SkipPageException)){
+ out = _jspx_out;
+ if (out != null && out.getBufferSize() != 0)
+ try {
+ if (response.isCommitted()) {
+ out.flush();
+ } else {
+ out.clearBuffer();
+ }
+ } catch (java.io.IOException e) {}
+ if (_jspx_page_context != null) _jspx_page_context.handlePageException(t);
+ else throw new ServletException(t);
+ }
+ } finally {
+ _jspxFactory.releasePageContext(_jspx_page_context);
+ }
+ }
+}