diff --git a/src/search/BasicSearch.java b/src/search/BasicSearch.java
index ec7894aa92b82a9f8d845bf7091c968987bfc82c..59b83266bd485f04526dcf86e16c915ffad35b9b 100644
--- a/src/search/BasicSearch.java
+++ b/src/search/BasicSearch.java
@@ -17,6 +17,10 @@ import sort.RangeHelper;
*
*/
public class BasicSearch {
+ public static BasicSearchResult range(Integer taxonId, Integer yearLo, Integer yearHi){
+ return range(taxonId, yearLo, yearHi, -90.0, 90.0, -180.0, 180.0);
+ }
+
/**
* Returns all records matching any of the children of the given TaxonID and in the
* date range given
@@ -25,29 +29,37 @@ public class BasicSearch {
* @param yearHi The upper bound on the year range
* @return
*/
- public static BasicSearchResult range(Integer taxonId, Integer yearLo, Integer yearHi){
- GeneralRange<Record> a0 = RangeHelper.date(Bound.ANY);
+ public static BasicSearchResult range(Integer taxonId, Integer yearLo, Integer yearHi, Double latLo, Double latHi, Double longLo, Double longHi){
+ GeneralRange<Record> dateRange = RangeHelper.date(Bound.ANY);
if ((yearLo != null) && (yearHi != null)) {
Date lower = new Date(yearLo,01,01);
Date upper = new Date(yearHi+1,01,01);
- a0 = RangeHelper.date(Bound.LOWHIGH, lower, upper);
+ dateRange = RangeHelper.date(Bound.LOWHIGH, lower, upper);
}
- GeneralRange<Record> a2 = r -> 0;
- GeneralRange<Record> a3 = r -> 0;
+ GeneralRange<Record> latRange = RangeHelper.latitude(Bound.ANY);
+ GeneralRange<Record> longRange = RangeHelper.longitude(Bound.ANY);
+
+ if ((latLo != null) && (latHi != null)) {
+ latRange = RangeHelper.latitude(Bound.LOWHIGH, latLo, latHi);
+ }
+
+ if ((longLo != null) && (longHi != null)) {
+ longRange = RangeHelper.longitude(Bound.LOWHIGH, longLo, longHi);
+ }
- GeneralRange<Record> a1;
+ GeneralRange<Record> taxonRange;
Iterable<Integer> searches = BioTree.getNonEmptyChildren(taxonId);
Stopwatch sw = new Stopwatch();
ArrayList<Record> results = new ArrayList<Record>();
for (Integer txId: searches) {
- a1 = RangeHelper.taxonID(Bound.EQUALS, txId);
+ taxonRange = RangeHelper.taxonID(Bound.EQUALS, txId);
ArrayList<GeneralRange<Record>> axes = new ArrayList<GeneralRange<Record>>();
- axes.add(a0);axes.add(a1);axes.add(a2);axes.add(a3);
+ axes.add(dateRange);axes.add(taxonRange);axes.add(latRange);axes.add(longRange);
results.addAll((Collection<? extends Record>) DataStore.records.rangeSearch(axes));
}
diff --git a/src/sort/RangeHelper.java b/src/sort/RangeHelper.java
index 2a960cb7eb51ac84d9f7c4af06e0cdd44b59eb5d..4110115eb5eb703fad41dd28d92a30d2d33325fc 100644
--- a/src/sort/RangeHelper.java
+++ b/src/sort/RangeHelper.java
@@ -84,7 +84,7 @@ public class RangeHelper {
* @param bound -Value of bound
* @return -General range that matches the bound
*/
- public static GeneralRange<Record> longitude(Bound boundtype, float bound) {
+ public static GeneralRange<Record> longitude(Bound boundtype, double bound) {
if (boundtype == Bound.LOWER) {
GeneralRange<Record> range = p -> p.getLongitude() < bound ? 0 : 1;
return range;
@@ -94,7 +94,7 @@ public class RangeHelper {
return range;
}
else if (boundtype == Bound.EQUALS) {
- GeneralRange<Record> range = p -> Float.compare(p.getLongitude(), bound) ;
+ GeneralRange<Record> range = p -> Double.compare(p.getLongitude(), bound) ;
return range;
}
else return null;
@@ -108,7 +108,7 @@ public class RangeHelper {
* @param rightbound -Value of right bound
* @return -General range that matches the bound
*/
- public static GeneralRange<Record> longitude(Bound boundtype, float leftbound, float rightbound) {
+ public static GeneralRange<Record> longitude(Bound boundtype, double leftbound, double rightbound) {
if (boundtype == Bound.LOWHIGH) {
GeneralRange<Record> range = p -> p.getLongitude() < leftbound ? -1 : (p.getLongitude() > rightbound ? 1 : 0);
return range;
@@ -138,7 +138,7 @@ public class RangeHelper {
* @param bound -Value of bound
* @return -General range that matches the bound
*/
- public static GeneralRange<Record> latitude(Bound boundtype, float bound) {
+ public static GeneralRange<Record> latitude(Bound boundtype, double bound) {
if (boundtype == Bound.LOWER) {
GeneralRange<Record> range = p -> p.getLatitude() < bound ? 0 : 1;
return range;
@@ -148,7 +148,7 @@ public class RangeHelper {
return range;
}
else if (boundtype == Bound.EQUALS) {
- GeneralRange<Record> range = p -> Float.compare(p.getLatitude(), bound);
+ GeneralRange<Record> range = p -> Double.compare(p.getLatitude(), bound);
return range;
}
else return null;
@@ -163,7 +163,7 @@ public class RangeHelper {
* @param rightbound -Value of right bound
* @return -General range that matches the bound
*/
- public static GeneralRange<Record> latitude(Bound boundtype, int leftbound, int rightbound) {
+ public static GeneralRange<Record> latitude(Bound boundtype, double leftbound, double rightbound) {
if (boundtype == Bound.LOWHIGH) {
GeneralRange<Record> range = p -> p.getLatitude() < leftbound ? -1 : (p.getLatitude() > rightbound ? 1 : 0);
return range;
diff --git a/tomcat/work/Catalina/localhost/ROOT/org/apache/jsp/index_jsp.java b/tomcat/work/Catalina/localhost/ROOT/org/apache/jsp/index_jsp.java
index 0601c6f25b6e32fe91d6100c085a10c1f6aa86f5..ba307a360a9f875e768439d706a9e8d8f66c4a39 100644
--- a/tomcat/work/Catalina/localhost/ROOT/org/apache/jsp/index_jsp.java
+++ b/tomcat/work/Catalina/localhost/ROOT/org/apache/jsp/index_jsp.java
@@ -1,437 +1,437 @@
-/*
- * Generated by the Jasper component of Apache Tomcat
- * Version: Apache Tomcat/9.0.6
- * Generated at: 2018-03-28 15:30:25 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.*;
-
-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("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;
- 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; charset=UTF-8");
- pageContext = _jspxFactory.getPageContext(this, request, response,
- null, false, 8192, true);
- _jspx_page_context = pageContext;
- application = pageContext.getServletContext();
- config = pageContext.getServletConfig();
- out = pageContext.getOut();
- _jspx_out = out;
-
- out.write('\n');
- out.write('\n');
-
-java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy");
-request.setAttribute("year", sdf.format(new java.util.Date()));
-request.setAttribute("tomcatUrl", "http://tomcat.apache.org/");
-request.setAttribute("tomcatDocUrl", "/docs/");
-request.setAttribute("tomcatExamplesUrl", "/examples/");
-
- 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(" <title>");
- out.print(request.getServletContext().getServerInfo() );
- out.write("</title>\n");
- out.write(" <link href=\"favicon.ico\" rel=\"icon\" type=\"image/x-icon\" />\n");
- out.write(" <link href=\"favicon.ico\" rel=\"shortcut icon\" type=\"image/x-icon\" />\n");
- out.write(" <link href=\"tomcat.css\" rel=\"stylesheet\" type=\"text/css\" />\n");
- out.write(" </head>\n");
- out.write("\n");
- out.write(" <body>\n");
- out.write(" <div id=\"wrapper\">\n");
- out.write(" <div id=\"navigation\" class=\"curved container\">\n");
- out.write(" <span id=\"nav-home\"><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("\">Home</a></span>\n");
- out.write(" <span id=\"nav-hosts\"><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("\">Documentation</a></span>\n");
- out.write(" <span id=\"nav-config\"><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("config/\">Configuration</a></span>\n");
- out.write(" <span id=\"nav-examples\"><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatExamplesUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("\">Examples</a></span>\n");
- out.write(" <span id=\"nav-wiki\"><a href=\"http://wiki.apache.org/tomcat/FrontPage\">Wiki</a></span>\n");
- out.write(" <span id=\"nav-lists\"><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("lists.html\">Mailing Lists</a></span>\n");
- out.write(" <span id=\"nav-help\"><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("findhelp.html\">Find Help</a></span>\n");
- out.write(" <br class=\"separator\" />\n");
- out.write(" </div>\n");
- out.write(" <div id=\"asf-box\">\n");
- out.write(" <h1>");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${pageContext.servletContext.serverInfo}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("</h1>\n");
- out.write(" </div>\n");
- out.write(" <div id=\"upper\" class=\"curved container\">\n");
- out.write(" <div id=\"congrats\" class=\"curved container\">\n");
- out.write(" <h2>If you're seeing this, you've successfully installed Tomcat. Congratulations!</h2>\n");
- out.write(" </div>\n");
- out.write(" <div id=\"notice\">\n");
- out.write(" <img src=\"tomcat.png\" alt=\"[tomcat logo]\" />\n");
- out.write(" <div id=\"tasks\">\n");
- out.write(" <h3>Recommended Reading:</h3>\n");
- out.write(" <h4><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("security-howto.html\">Security Considerations HOW-TO</a></h4>\n");
- out.write(" <h4><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("manager-howto.html\">Manager Application HOW-TO</a></h4>\n");
- out.write(" <h4><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("cluster-howto.html\">Clustering/Session Replication HOW-TO</a></h4>\n");
- out.write(" </div>\n");
- out.write(" </div>\n");
- out.write(" <div id=\"actions\">\n");
- out.write(" <div class=\"button\">\n");
- out.write(" <a class=\"container shadow\" href=\"/manager/status\"><span>Server Status</span></a>\n");
- out.write(" </div>\n");
- out.write(" <div class=\"button\">\n");
- out.write(" <a class=\"container shadow\" href=\"/manager/html\"><span>Manager App</span></a>\n");
- out.write(" </div>\n");
- out.write(" <div class=\"button\">\n");
- out.write(" <a class=\"container shadow\" href=\"/host-manager/html\"><span>Host Manager</span></a>\n");
- out.write(" </div>\n");
- out.write(" </div>\n");
- out.write(" <!--\n");
- out.write(" <br class=\"separator\" />\n");
- out.write(" -->\n");
- out.write(" <br class=\"separator\" />\n");
- out.write(" </div>\n");
- out.write(" <div id=\"middle\" class=\"curved container\">\n");
- out.write(" <h3>Developer Quick Start</h3>\n");
- out.write(" <div class=\"col25\">\n");
- out.write(" <div class=\"container\">\n");
- out.write(" <p><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("setup.html\">Tomcat Setup</a></p>\n");
- out.write(" <p><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("appdev/\">First Web Application</a></p>\n");
- out.write(" </div>\n");
- out.write(" </div>\n");
- out.write(" <div class=\"col25\">\n");
- out.write(" <div class=\"container\">\n");
- out.write(" <p><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("realm-howto.html\">Realms & AAA</a></p>\n");
- out.write(" <p><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("jndi-datasource-examples-howto.html\">JDBC DataSources</a></p>\n");
- out.write(" </div>\n");
- out.write(" </div>\n");
- out.write(" <div class=\"col25\">\n");
- out.write(" <div class=\"container\">\n");
- out.write(" <p><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatExamplesUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("\">Examples</a></p>\n");
- out.write(" </div>\n");
- out.write(" </div>\n");
- out.write(" <div class=\"col25\">\n");
- out.write(" <div class=\"container\">\n");
- out.write(" <p><a href=\"http://wiki.apache.org/tomcat/Specifications\">Servlet Specifications</a></p>\n");
- out.write(" <p><a href=\"http://wiki.apache.org/tomcat/TomcatVersions\">Tomcat Versions</a></p>\n");
- out.write(" </div>\n");
- out.write(" </div>\n");
- out.write(" <br class=\"separator\" />\n");
- out.write(" </div>\n");
- out.write(" <div id=\"lower\">\n");
- out.write(" <div id=\"low-manage\" class=\"\">\n");
- out.write(" <div class=\"curved container\">\n");
- out.write(" <h3>Managing Tomcat</h3>\n");
- out.write(" <p>For security, access to the <a href=\"/manager/html\">manager webapp</a> is restricted.\n");
- out.write(" Users are defined in:</p>\n");
- out.write(" <pre>$CATALINA_HOME/conf/tomcat-users.xml</pre>\n");
- out.write(" <p>In Tomcat 9.0 access to the manager application is split between\n");
- out.write(" different users. <a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("manager-howto.html\">Read more...</a></p>\n");
- out.write(" <br />\n");
- out.write(" <h4><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("RELEASE-NOTES.txt\">Release Notes</a></h4>\n");
- out.write(" <h4><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("changelog.html\">Changelog</a></h4>\n");
- out.write(" <h4><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("migration.html\">Migration Guide</a></h4>\n");
- out.write(" <h4><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("security.html\">Security Notices</a></h4>\n");
- out.write(" </div>\n");
- out.write(" </div>\n");
- out.write(" <div id=\"low-docs\" class=\"\">\n");
- out.write(" <div class=\"curved container\">\n");
- out.write(" <h3>Documentation</h3>\n");
- out.write(" <h4><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("\">Tomcat 9.0 Documentation</a></h4>\n");
- out.write(" <h4><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("config/\">Tomcat 9.0 Configuration</a></h4>\n");
- out.write(" <h4><a href=\"http://wiki.apache.org/tomcat/FrontPage\">Tomcat Wiki</a></h4>\n");
- out.write(" <p>Find additional important configuration information in:</p>\n");
- out.write(" <pre>$CATALINA_HOME/RUNNING.txt</pre>\n");
- out.write(" <p>Developers may be interested in:</p>\n");
- out.write(" <ul>\n");
- out.write(" <li><a href=\"http://tomcat.apache.org/bugreport.html\">Tomcat 9.0 Bug Database</a></li>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("api/index.html\">Tomcat 9.0 JavaDocs</a></li>\n");
- out.write(" <li><a href=\"http://svn.apache.org/repos/asf/tomcat/tc9.0.x/\">Tomcat 9.0 SVN Repository</a></li>\n");
- out.write(" </ul>\n");
- out.write(" </div>\n");
- out.write(" </div>\n");
- out.write(" <div id=\"low-help\" class=\"\">\n");
- out.write(" <div class=\"curved container\">\n");
- out.write(" <h3>Getting Help</h3>\n");
- out.write(" <h4><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("faq/\">FAQ</a> and <a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("lists.html\">Mailing Lists</a></h4>\n");
- out.write(" <p>The following mailing lists are available:</p>\n");
- out.write(" <ul>\n");
- out.write(" <li id=\"list-announce\"><strong><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("lists.html#tomcat-announce\">tomcat-announce</a><br />\n");
- out.write(" Important announcements, releases, security vulnerability notifications. (Low volume).</strong>\n");
- out.write(" </li>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("lists.html#tomcat-users\">tomcat-users</a><br />\n");
- out.write(" User support and discussion\n");
- out.write(" </li>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("lists.html#taglibs-user\">taglibs-user</a><br />\n");
- out.write(" User support and discussion for <a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("taglibs/\">Apache Taglibs</a>\n");
- out.write(" </li>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("lists.html#tomcat-dev\">tomcat-dev</a><br />\n");
- out.write(" Development mailing list, including commit messages\n");
- out.write(" </li>\n");
- out.write(" </ul>\n");
- out.write(" </div>\n");
- out.write(" </div>\n");
- out.write(" <br class=\"separator\" />\n");
- out.write(" </div>\n");
- out.write(" <div id=\"footer\" class=\"curved container\">\n");
- out.write(" <div class=\"col20\">\n");
- out.write(" <div class=\"container\">\n");
- out.write(" <h4>Other Downloads</h4>\n");
- out.write(" <ul>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("download-connectors.cgi\">Tomcat Connectors</a></li>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("download-native.cgi\">Tomcat Native</a></li>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("taglibs/\">Taglibs</a></li>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("deployer-howto.html\">Deployer</a></li>\n");
- out.write(" </ul>\n");
- out.write(" </div>\n");
- out.write(" </div>\n");
- out.write(" <div class=\"col20\">\n");
- out.write(" <div class=\"container\">\n");
- out.write(" <h4>Other Documentation</h4>\n");
- out.write(" <ul>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("connectors-doc/\">Tomcat Connectors</a></li>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("connectors-doc/\">mod_jk Documentation</a></li>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("native-doc/\">Tomcat Native</a></li>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("deployer-howto.html\">Deployer</a></li>\n");
- out.write(" </ul>\n");
- out.write(" </div>\n");
- out.write(" </div>\n");
- out.write(" <div class=\"col20\">\n");
- out.write(" <div class=\"container\">\n");
- out.write(" <h4>Get Involved</h4>\n");
- out.write(" <ul>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("getinvolved.html\">Overview</a></li>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("svn.html\">SVN Repositories</a></li>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("lists.html\">Mailing Lists</a></li>\n");
- out.write(" <li><a href=\"http://wiki.apache.org/tomcat/FrontPage\">Wiki</a></li>\n");
- out.write(" </ul>\n");
- out.write(" </div>\n");
- out.write(" </div>\n");
- out.write(" <div class=\"col20\">\n");
- out.write(" <div class=\"container\">\n");
- out.write(" <h4>Miscellaneous</h4>\n");
- out.write(" <ul>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("contact.html\">Contact</a></li>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("legal.html\">Legal</a></li>\n");
- out.write(" <li><a href=\"http://www.apache.org/foundation/sponsorship.html\">Sponsorship</a></li>\n");
- out.write(" <li><a href=\"http://www.apache.org/foundation/thanks.html\">Thanks</a></li>\n");
- out.write(" </ul>\n");
- out.write(" </div>\n");
- out.write(" </div>\n");
- out.write(" <div class=\"col20\">\n");
- out.write(" <div class=\"container\">\n");
- out.write(" <h4>Apache Software Foundation</h4>\n");
- out.write(" <ul>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("whoweare.html\">Who We Are</a></li>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("heritage.html\">Heritage</a></li>\n");
- out.write(" <li><a href=\"http://www.apache.org\">Apache Home</a></li>\n");
- out.write(" <li><a href=\"");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write("resources.html\">Resources</a></li>\n");
- out.write(" </ul>\n");
- out.write(" </div>\n");
- out.write(" </div>\n");
- out.write(" <br class=\"separator\" />\n");
- out.write(" </div>\n");
- out.write(" <p class=\"copyright\">Copyright ©1999-");
- out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${year}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
- out.write(" Apache Software Foundation. All Rights Reserved</p>\n");
- out.write(" </div>\n");
- out.write(" </body>\n");
- out.write("\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-29 13:38:27 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.*;
+
+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("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;
+ 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; charset=UTF-8");
+ pageContext = _jspxFactory.getPageContext(this, request, response,
+ null, false, 8192, true);
+ _jspx_page_context = pageContext;
+ application = pageContext.getServletContext();
+ config = pageContext.getServletConfig();
+ out = pageContext.getOut();
+ _jspx_out = out;
+
+ out.write("\r\n");
+ out.write("\r\n");
+
+java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy");
+request.setAttribute("year", sdf.format(new java.util.Date()));
+request.setAttribute("tomcatUrl", "http://tomcat.apache.org/");
+request.setAttribute("tomcatDocUrl", "/docs/");
+request.setAttribute("tomcatExamplesUrl", "/examples/");
+
+ out.write("\r\n");
+ out.write("<!DOCTYPE html>\r\n");
+ out.write("<html lang=\"en\">\r\n");
+ out.write(" <head>\r\n");
+ out.write(" <meta charset=\"UTF-8\" />\r\n");
+ out.write(" <title>");
+ out.print(request.getServletContext().getServerInfo() );
+ out.write("</title>\r\n");
+ out.write(" <link href=\"favicon.ico\" rel=\"icon\" type=\"image/x-icon\" />\r\n");
+ out.write(" <link href=\"favicon.ico\" rel=\"shortcut icon\" type=\"image/x-icon\" />\r\n");
+ out.write(" <link href=\"tomcat.css\" rel=\"stylesheet\" type=\"text/css\" />\r\n");
+ out.write(" </head>\r\n");
+ out.write("\r\n");
+ out.write(" <body>\r\n");
+ out.write(" <div id=\"wrapper\">\r\n");
+ out.write(" <div id=\"navigation\" class=\"curved container\">\r\n");
+ out.write(" <span id=\"nav-home\"><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("\">Home</a></span>\r\n");
+ out.write(" <span id=\"nav-hosts\"><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("\">Documentation</a></span>\r\n");
+ out.write(" <span id=\"nav-config\"><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("config/\">Configuration</a></span>\r\n");
+ out.write(" <span id=\"nav-examples\"><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatExamplesUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("\">Examples</a></span>\r\n");
+ out.write(" <span id=\"nav-wiki\"><a href=\"http://wiki.apache.org/tomcat/FrontPage\">Wiki</a></span>\r\n");
+ out.write(" <span id=\"nav-lists\"><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("lists.html\">Mailing Lists</a></span>\r\n");
+ out.write(" <span id=\"nav-help\"><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("findhelp.html\">Find Help</a></span>\r\n");
+ out.write(" <br class=\"separator\" />\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div id=\"asf-box\">\r\n");
+ out.write(" <h1>");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${pageContext.servletContext.serverInfo}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("</h1>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div id=\"upper\" class=\"curved container\">\r\n");
+ out.write(" <div id=\"congrats\" class=\"curved container\">\r\n");
+ out.write(" <h2>If you're seeing this, you've successfully installed Tomcat. Congratulations!</h2>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div id=\"notice\">\r\n");
+ out.write(" <img src=\"tomcat.png\" alt=\"[tomcat logo]\" />\r\n");
+ out.write(" <div id=\"tasks\">\r\n");
+ out.write(" <h3>Recommended Reading:</h3>\r\n");
+ out.write(" <h4><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("security-howto.html\">Security Considerations HOW-TO</a></h4>\r\n");
+ out.write(" <h4><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("manager-howto.html\">Manager Application HOW-TO</a></h4>\r\n");
+ out.write(" <h4><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("cluster-howto.html\">Clustering/Session Replication HOW-TO</a></h4>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div id=\"actions\">\r\n");
+ out.write(" <div class=\"button\">\r\n");
+ out.write(" <a class=\"container shadow\" href=\"/manager/status\"><span>Server Status</span></a>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div class=\"button\">\r\n");
+ out.write(" <a class=\"container shadow\" href=\"/manager/html\"><span>Manager App</span></a>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div class=\"button\">\r\n");
+ out.write(" <a class=\"container shadow\" href=\"/host-manager/html\"><span>Host Manager</span></a>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <!--\r\n");
+ out.write(" <br class=\"separator\" />\r\n");
+ out.write(" -->\r\n");
+ out.write(" <br class=\"separator\" />\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div id=\"middle\" class=\"curved container\">\r\n");
+ out.write(" <h3>Developer Quick Start</h3>\r\n");
+ out.write(" <div class=\"col25\">\r\n");
+ out.write(" <div class=\"container\">\r\n");
+ out.write(" <p><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("setup.html\">Tomcat Setup</a></p>\r\n");
+ out.write(" <p><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("appdev/\">First Web Application</a></p>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div class=\"col25\">\r\n");
+ out.write(" <div class=\"container\">\r\n");
+ out.write(" <p><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("realm-howto.html\">Realms & AAA</a></p>\r\n");
+ out.write(" <p><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("jndi-datasource-examples-howto.html\">JDBC DataSources</a></p>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div class=\"col25\">\r\n");
+ out.write(" <div class=\"container\">\r\n");
+ out.write(" <p><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatExamplesUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("\">Examples</a></p>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div class=\"col25\">\r\n");
+ out.write(" <div class=\"container\">\r\n");
+ out.write(" <p><a href=\"http://wiki.apache.org/tomcat/Specifications\">Servlet Specifications</a></p>\r\n");
+ out.write(" <p><a href=\"http://wiki.apache.org/tomcat/TomcatVersions\">Tomcat Versions</a></p>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <br class=\"separator\" />\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div id=\"lower\">\r\n");
+ out.write(" <div id=\"low-manage\" class=\"\">\r\n");
+ out.write(" <div class=\"curved container\">\r\n");
+ out.write(" <h3>Managing Tomcat</h3>\r\n");
+ out.write(" <p>For security, access to the <a href=\"/manager/html\">manager webapp</a> is restricted.\r\n");
+ out.write(" Users are defined in:</p>\r\n");
+ out.write(" <pre>$CATALINA_HOME/conf/tomcat-users.xml</pre>\r\n");
+ out.write(" <p>In Tomcat 9.0 access to the manager application is split between\r\n");
+ out.write(" different users. <a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("manager-howto.html\">Read more...</a></p>\r\n");
+ out.write(" <br />\r\n");
+ out.write(" <h4><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("RELEASE-NOTES.txt\">Release Notes</a></h4>\r\n");
+ out.write(" <h4><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("changelog.html\">Changelog</a></h4>\r\n");
+ out.write(" <h4><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("migration.html\">Migration Guide</a></h4>\r\n");
+ out.write(" <h4><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("security.html\">Security Notices</a></h4>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div id=\"low-docs\" class=\"\">\r\n");
+ out.write(" <div class=\"curved container\">\r\n");
+ out.write(" <h3>Documentation</h3>\r\n");
+ out.write(" <h4><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("\">Tomcat 9.0 Documentation</a></h4>\r\n");
+ out.write(" <h4><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("config/\">Tomcat 9.0 Configuration</a></h4>\r\n");
+ out.write(" <h4><a href=\"http://wiki.apache.org/tomcat/FrontPage\">Tomcat Wiki</a></h4>\r\n");
+ out.write(" <p>Find additional important configuration information in:</p>\r\n");
+ out.write(" <pre>$CATALINA_HOME/RUNNING.txt</pre>\r\n");
+ out.write(" <p>Developers may be interested in:</p>\r\n");
+ out.write(" <ul>\r\n");
+ out.write(" <li><a href=\"http://tomcat.apache.org/bugreport.html\">Tomcat 9.0 Bug Database</a></li>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("api/index.html\">Tomcat 9.0 JavaDocs</a></li>\r\n");
+ out.write(" <li><a href=\"http://svn.apache.org/repos/asf/tomcat/tc9.0.x/\">Tomcat 9.0 SVN Repository</a></li>\r\n");
+ out.write(" </ul>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div id=\"low-help\" class=\"\">\r\n");
+ out.write(" <div class=\"curved container\">\r\n");
+ out.write(" <h3>Getting Help</h3>\r\n");
+ out.write(" <h4><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("faq/\">FAQ</a> and <a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("lists.html\">Mailing Lists</a></h4>\r\n");
+ out.write(" <p>The following mailing lists are available:</p>\r\n");
+ out.write(" <ul>\r\n");
+ out.write(" <li id=\"list-announce\"><strong><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("lists.html#tomcat-announce\">tomcat-announce</a><br />\r\n");
+ out.write(" Important announcements, releases, security vulnerability notifications. (Low volume).</strong>\r\n");
+ out.write(" </li>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("lists.html#tomcat-users\">tomcat-users</a><br />\r\n");
+ out.write(" User support and discussion\r\n");
+ out.write(" </li>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("lists.html#taglibs-user\">taglibs-user</a><br />\r\n");
+ out.write(" User support and discussion for <a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("taglibs/\">Apache Taglibs</a>\r\n");
+ out.write(" </li>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("lists.html#tomcat-dev\">tomcat-dev</a><br />\r\n");
+ out.write(" Development mailing list, including commit messages\r\n");
+ out.write(" </li>\r\n");
+ out.write(" </ul>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <br class=\"separator\" />\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div id=\"footer\" class=\"curved container\">\r\n");
+ out.write(" <div class=\"col20\">\r\n");
+ out.write(" <div class=\"container\">\r\n");
+ out.write(" <h4>Other Downloads</h4>\r\n");
+ out.write(" <ul>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("download-connectors.cgi\">Tomcat Connectors</a></li>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("download-native.cgi\">Tomcat Native</a></li>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("taglibs/\">Taglibs</a></li>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("deployer-howto.html\">Deployer</a></li>\r\n");
+ out.write(" </ul>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div class=\"col20\">\r\n");
+ out.write(" <div class=\"container\">\r\n");
+ out.write(" <h4>Other Documentation</h4>\r\n");
+ out.write(" <ul>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("connectors-doc/\">Tomcat Connectors</a></li>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("connectors-doc/\">mod_jk Documentation</a></li>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("native-doc/\">Tomcat Native</a></li>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("deployer-howto.html\">Deployer</a></li>\r\n");
+ out.write(" </ul>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div class=\"col20\">\r\n");
+ out.write(" <div class=\"container\">\r\n");
+ out.write(" <h4>Get Involved</h4>\r\n");
+ out.write(" <ul>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("getinvolved.html\">Overview</a></li>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("svn.html\">SVN Repositories</a></li>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("lists.html\">Mailing Lists</a></li>\r\n");
+ out.write(" <li><a href=\"http://wiki.apache.org/tomcat/FrontPage\">Wiki</a></li>\r\n");
+ out.write(" </ul>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div class=\"col20\">\r\n");
+ out.write(" <div class=\"container\">\r\n");
+ out.write(" <h4>Miscellaneous</h4>\r\n");
+ out.write(" <ul>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("contact.html\">Contact</a></li>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("legal.html\">Legal</a></li>\r\n");
+ out.write(" <li><a href=\"http://www.apache.org/foundation/sponsorship.html\">Sponsorship</a></li>\r\n");
+ out.write(" <li><a href=\"http://www.apache.org/foundation/thanks.html\">Thanks</a></li>\r\n");
+ out.write(" </ul>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <div class=\"col20\">\r\n");
+ out.write(" <div class=\"container\">\r\n");
+ out.write(" <h4>Apache Software Foundation</h4>\r\n");
+ out.write(" <ul>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("whoweare.html\">Who We Are</a></li>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("heritage.html\">Heritage</a></li>\r\n");
+ out.write(" <li><a href=\"http://www.apache.org\">Apache Home</a></li>\r\n");
+ out.write(" <li><a href=\"");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write("resources.html\">Resources</a></li>\r\n");
+ out.write(" </ul>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <br class=\"separator\" />\r\n");
+ out.write(" </div>\r\n");
+ out.write(" <p class=\"copyright\">Copyright ©1999-");
+ out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${year}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
+ out.write(" Apache Software Foundation. All Rights Reserved</p>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </body>\r\n");
+ out.write("\r\n");
+ out.write("</html>\r\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);
+ }
+ }
+}
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 b32aa05858eb3be1a8289110b8e0156c8d2718fe..79b4e8e45d7333a6b82b6f58a3a2cb08c5aaa41e 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,233 +1,233 @@
-/*
- * Generated by the Jasper component of Apache Tomcat
- * Version: Apache Tomcat/9.0.6
- * Generated at: 2018-03-29 12:36:51 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(" <!--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("\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(" <div class=\"headerWrapper\">\n");
- out.write(" <a href=\"index.jsp\" >TrawlTool</a>\n");
- out.write(" <span class=\"nav-bar\">\n");
- out.write(" <a href=\"about.html\">About</a> |\n");
- out.write(" <a href=\"index.html\" target=\"_blank\">Gitlab/Github Nonfunc!</a>\n");
- out.write(" </span>\n");
- out.write(" </div>\n");
- out.write(" </header>\n");
- out.write("\n");
- out.write(" <section id=\"main\">\n");
- out.write(" <section id=\"formWrapper\">\n");
- out.write(" <section id=\"pickSciRanks\">\n");
- out.write(" Phylum:\n");
- out.write(" <select name=\"pickSciR\" id=\"pickPhylum\" size=\"1\" onChange=\"changedSciR('phylum')\"><!--Dynamically Filled--></select>\n");
- out.write("\n");
- out.write(" Class:\n");
- out.write(" <select name=\"pickSciR\" id=\"pickClass\" size=\"1\" onChange=\"changedSciR('class')\">\n");
- out.write(" <option value=\"00\">Arthropoda</option>\n");
- out.write(" <option value=\"01\">Chordata</option>\n");
- out.write(" <option value=\"03\">Mollusca</option>\n");
- out.write(" </select>\n");
- out.write(" Order:\n");
- out.write(" <select name=\"pickSciR\" size=\"1\" onChange=\"alert()\"><!--Dynamically Filled--></select>\n");
- out.write(" Family:\n");
- out.write(" <select name=\"pickSciR\" size=\"1\"><!--Dynamically Filled--></select>\n");
- out.write(" Genus:\n");
- out.write(" <select name=\"pickSciR\" size=\"1\"><!--Dynamically Filled--></select>\n");
- out.write(" Species:\n");
- out.write(" <select name=\"pickSciR\" size=\"1\"><!--Dynamically Filled--></select>\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(" <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(" ");
- out.write("\n");
- out.write(" <input type=\"radio\" name=\"pickOutput\" value=\"map\"> Map\n");
- out.write(" <input type=\"radio\" name=\"pickOutput\" value=\"histogram\" checked> Histogram\n");
- out.write(" <button type=\"button\" onclick=\"\">Load</button>\n");
- out.write(" <button type=\"button\" onclick=\"\">View Individual Records</button> <!--To records.html-->\n");
- out.write(" </section>\n");
- out.write(" </section>\n");
- out.write("\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. Histogram selected by default but we might want to have a loading screen instead.\n");
- out.write(" <div id=\"console\">~~~ PSEUDO-CONSOLE ~~~<br></div>\n");
- out.write(" </section>\n");
- out.write(" </section>\n");
- out.write(" </section>\n");
- out.write(" ");
- out.write("\n");
- out.write(" ");
- out.write("\n");
- out.write(" ");
- out.write("\n");
- out.write("</body>\n");
- out.write("</html>\n");
- out.write("\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-29 13:42:06 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("\r\n");
+ out.write("<!--\r\n");
+ out.write("Double Handle Slider Modified from: http://jqueryui.com/slider/#range\r\n");
+ out.write("-->\r\n");
+ out.write("\r\n");
+ out.write("<!DOCTYPE html>\r\n");
+ out.write("<html lang=\"en\">\r\n");
+ out.write("<head>\r\n");
+ out.write(" <meta charset=\"UTF-8\">\r\n");
+ out.write(" <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\r\n");
+ out.write(" <meta name=\"keywords\" content=\"insert, some, keywords\"> <!--TODO-->\r\n");
+ out.write(" <meta name=\"description\" content=\"insert a description\"> <!--TODO-->\r\n");
+ out.write(" <title>TrawlTool</title>\r\n");
+ out.write(" <link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\">\r\n");
+ out.write("\r\n");
+ out.write(" <!--JQuery-->\r\n");
+ out.write(" <script src=\"https://code.jquery.com/jquery-1.12.4.js\"></script>\r\n");
+ out.write(" <script src=\"https://code.jquery.com/ui/1.12.1/jquery-ui.js\"></script>\r\n");
+ out.write(" <link rel=\"stylesheet\" href=\"//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css\">\r\n");
+ out.write("\r\n");
+ out.write(" <!-- MUST load JQuery Library before loading this-->\r\n");
+ out.write(" <script src=\"script.js\"></script>\r\n");
+ out.write("\r\n");
+ out.write(" <!--Fonts-->\r\n");
+ out.write(" <!--Open Sans Rg-400/Semi-600/Bd-700-->\r\n");
+ out.write(" <link href=\"https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700\" rel=\"stylesheet\">\r\n");
+ out.write("\r\n");
+ out.write(" <!--Plugins-->\r\n");
+ out.write("</head>\r\n");
+ out.write("<body>\r\n");
+ out.write(" <header>\r\n");
+ out.write(" <div class=\"headerWrapper\">\r\n");
+ out.write(" <a href=\"index.jsp\" >TrawlTool</a>\r\n");
+ out.write(" <span class=\"nav-bar\">\r\n");
+ out.write(" <a href=\"about.html\">About</a> |\r\n");
+ out.write(" <a href=\"index.html\" target=\"_blank\">Gitlab/Github Nonfunc!</a>\r\n");
+ out.write(" </span>\r\n");
+ out.write(" </div>\r\n");
+ out.write(" </header>\r\n");
+ out.write("\r\n");
+ out.write(" <section id=\"main\">\r\n");
+ out.write(" <section id=\"formWrapper\">\r\n");
+ out.write(" <section id=\"pickSciRanks\">\r\n");
+ out.write(" Phylum:\r\n");
+ out.write(" <select name=\"pickSciR\" id=\"pickPhylum\" size=\"1\" onChange=\"changedSciR('phylum')\"><!--Dynamically Filled--></select>\r\n");
+ out.write("\r\n");
+ out.write(" Class:\r\n");
+ out.write(" <select name=\"pickSciR\" id=\"pickClass\" size=\"1\" onChange=\"changedSciR('class')\">\r\n");
+ out.write(" <option value=\"00\">Arthropoda</option>\r\n");
+ out.write(" <option value=\"01\">Chordata</option>\r\n");
+ out.write(" <option value=\"03\">Mollusca</option>\r\n");
+ out.write(" </select>\r\n");
+ out.write(" Order:\r\n");
+ out.write(" <select name=\"pickSciR\" size=\"1\" onChange=\"alert()\"><!--Dynamically Filled--></select>\r\n");
+ out.write(" Family:\r\n");
+ out.write(" <select name=\"pickSciR\" size=\"1\"><!--Dynamically Filled--></select>\r\n");
+ out.write(" Genus:\r\n");
+ out.write(" <select name=\"pickSciR\" size=\"1\"><!--Dynamically Filled--></select>\r\n");
+ out.write(" Species:\r\n");
+ out.write(" <select name=\"pickSciR\" size=\"1\"><!--Dynamically Filled--></select>\r\n");
+ out.write(" </section>\r\n");
+ out.write("\r\n");
+ out.write(" <section id=\"yearIn\">\r\n");
+ out.write(" Year Range:\r\n");
+ out.write(" <span id=\"fromtoYear\">InnerHtml</span>\r\n");
+ out.write(" <form>\r\n");
+ out.write(" <div id=\"slider-range\"></div>\r\n");
+ out.write(" </form>\r\n");
+ out.write(" </section>\r\n");
+ out.write("\r\n");
+ out.write(" <section id=\"outputIn\">\r\n");
+ out.write(" ");
+ out.write("\r\n");
+ out.write(" <input type=\"radio\" name=\"pickOutput\" value=\"map\"> Map\r\n");
+ out.write(" <input type=\"radio\" name=\"pickOutput\" value=\"histogram\" checked> Histogram\r\n");
+ out.write(" <button type=\"button\" onclick=\"\">Load</button>\r\n");
+ out.write(" <button type=\"button\" onclick=\"\">View Individual Records</button> <!--To records.html-->\r\n");
+ out.write(" </section>\r\n");
+ out.write(" </section>\r\n");
+ out.write("\r\n");
+ out.write("\r\n");
+ out.write(" <section id=\"outputWrapper\">\r\n");
+ out.write(" <section id=\"outputDetails\">Stuff like population count, entries found, etc. go here</section>\r\n");
+ out.write(" <section id=\"outputBox\">Map, Histogram Box. Histogram selected by default but we might want to have a loading screen instead.\r\n");
+ out.write(" <div id=\"console\">~~~ PSEUDO-CONSOLE ~~~<br></div>\r\n");
+ out.write(" </section>\r\n");
+ out.write(" </section>\r\n");
+ out.write(" </section>\r\n");
+ out.write(" ");
+ out.write("\r\n");
+ out.write(" ");
+ out.write("\r\n");
+ out.write(" ");
+ out.write("\r\n");
+ out.write("</body>\r\n");
+ out.write("</html>\r\n");
+ out.write("\r\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);
+ }
+ }
+}
diff --git a/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/result_jsp.java b/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/result_jsp.java
index 6df0726c5606860db28aef0ab3299cb03c9e07df..988a0684a6359ea1b63ec416ad9aa15d3bd6bb0d 100644
--- a/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/result_jsp.java
+++ b/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/result_jsp.java
@@ -1,178 +1,178 @@
-/*
- * Generated by the Jasper component of Apache Tomcat
- * Version: Apache Tomcat/9.0.6
- * Generated at: 2018-03-28 02:31:35 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 search.BasicSearchResult;
-import java.util.*;
-import data.Record;
-import model.TrawlExpert;
-
-public final class result_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 = new java.util.HashSet<>();
- _jspx_imports_classes.add("data.Record");
- _jspx_imports_classes.add("search.BasicSearchResult");
- _jspx_imports_classes.add("model.TrawlExpert");
- }
-
- 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("<html>\n");
- out.write("<body>\n");
- out.write("<h1 align=\"center\">Trawl Results</h1>\n");
- out.write("<p>\n");
- out.write("\n");
- out.write("<table>\n");
- out.write("<tr>\n");
- out.write("\t<th>Scientific Name</th>\n");
- out.write("\t<th>Year</th>\n");
- out.write("\t<th>Month</th>\n");
- out.write("\t<th>Day</th>\n");
- out.write("\t<th>Latitude</th>\n");
- out.write("\t<th>Longitude</th>\n");
- out.write("\t<th>Individual Count</th>\n");
- out.write("</tr>\n");
-
- TrawlExpert te = (TrawlExpert)request.getServletContext().getAttribute("trawl");
- BasicSearchResult results = (BasicSearchResult) request.getAttribute("results");
- for (Record r: results.results()){
- out.print("<tr>\n");
- out.print("<th>" + te.getTaxonRecord(r.getTaxonId()).getName() + "</th>\n");
- out.print("<th>" + r.getDate().getYear() + "</th>\n");
- out.print("<th>" + r.getDate().getMonth() + "</th>\n");
- out.print("<th>" + r.getDate().getDay() + "</th>\n");
- out.print("<th>" + r.getLatitude() + "</th>\n");
- out.print("<th>" + r.getLongitude() + "</th>\n");
- out.print("<th>" + r.getCount() + "</th>\n");
- out.print("</tr>\n");
- }
-
- out.write("\n");
- out.write("</table>\n");
- out.write("</body>\n");
- out.write("</html>");
- } 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-29 13:42:08 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 search.BasicSearchResult;
+import java.util.*;
+import data.Record;
+import model.TrawlExpert;
+
+public final class result_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 = new java.util.HashSet<>();
+ _jspx_imports_classes.add("data.Record");
+ _jspx_imports_classes.add("search.BasicSearchResult");
+ _jspx_imports_classes.add("model.TrawlExpert");
+ }
+
+ 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("\r\n");
+ out.write("\r\n");
+ out.write("<html>\r\n");
+ out.write("<body>\r\n");
+ out.write("<h1 align=\"center\">Trawl Results</h1>\r\n");
+ out.write("<p>\r\n");
+ out.write("\r\n");
+ out.write("<table>\r\n");
+ out.write("<tr>\r\n");
+ out.write("\t<th>Scientific Name</th>\r\n");
+ out.write("\t<th>Year</th>\r\n");
+ out.write("\t<th>Month</th>\r\n");
+ out.write("\t<th>Day</th>\r\n");
+ out.write("\t<th>Latitude</th>\r\n");
+ out.write("\t<th>Longitude</th>\r\n");
+ out.write("\t<th>Individual Count</th>\r\n");
+ out.write("</tr>\r\n");
+
+ TrawlExpert te = (TrawlExpert)request.getServletContext().getAttribute("trawl");
+ BasicSearchResult results = te.rangeSearch(159512, 1960, 2016);
+ for (Record r: results.results()){
+ out.print("<tr>\n");
+ out.print("<th>" + te.getTaxonRecord(r.getTaxonId()).getName() + "</th>\n");
+ out.print("<th>" + r.getDate().getYear() + "</th>\n");
+ out.print("<th>" + r.getDate().getMonth() + "</th>\n");
+ out.print("<th>" + r.getDate().getDay() + "</th>\n");
+ out.print("<th>" + r.getLatitude() + "</th>\n");
+ out.print("<th>" + r.getLongitude() + "</th>\n");
+ out.print("<th>" + r.getCount() + "</th>\n");
+ out.print("</tr>\n");
+ }
+
+ out.write("\r\n");
+ out.write("</table>\r\n");
+ out.write("</body>\r\n");
+ out.write("</html>");
+ } 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);
+ }
+ }
+}