diff --git a/makefile b/makefile
index 0c059edb65f32c66ba1f17c281a6a521ab5fa86b..d750ca571ccf2d3e331435c95388ce95f4cd69b6 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,8 @@
server:
+ mkdir -p tomcat/webapps/Trawl/WEB-INF/classes
+ chmod u+x tomcat/bin/startup.sh
+ chmod u+x tomcat/bin/shutdown.sh
+ chmod u+x tomcat/bin/catalina.sh
cp -rf bin/* tomcat/webapps/Trawl/WEB-INF/classes
start: server
diff --git a/src/sandbox/Point.java b/src/sandbox/Point.java
index ea0d0fde7d1e43fe54b5b71bdc0010f3901daffe..ffd4e0c7a98961077f109edd67f0b42fa20877a8 100644
--- a/src/sandbox/Point.java
+++ b/src/sandbox/Point.java
@@ -7,19 +7,19 @@ public class Point implements Comparable<Point>, Serializable {
*
*/
private static final long serialVersionUID = 5361956730616676054L;
- private final int x;
- private final int y;
+ private final double x;
+ private final double y;
- public Point(int x, int y) {
+ public Point(double x, double y) {
this.x = x;
this.y = y;
}
- public int getX() {
+ public double getX() {
return this.x;
}
- public int getY() {
+ public double getY() {
return this.y;
}
diff --git a/src/search/RecordCluster.java b/src/search/RecordCluster.java
new file mode 100644
index 0000000000000000000000000000000000000000..e896722d99576a106e6e3fbf1ac7dd1dcc4d5346
--- /dev/null
+++ b/src/search/RecordCluster.java
@@ -0,0 +1,38 @@
+package search;
+
+import java.util.ArrayList;
+
+import data.Record;
+import sandbox.Point;
+
+public class RecordCluster {
+ private ArrayList<Record> records;
+ private Point centroid;
+
+ public void addRecord(Record r) {
+ records.add(r);
+ }
+
+ public Iterable<Record> records(){
+ return records;
+ }
+
+ public int N() {
+ return records.size();
+ }
+
+ public Point centroid() {
+ double x = 0;
+ double y = 0;
+
+ for (Record r: records()) {
+ x += r.getLongitude();
+ y += r.getLatitude();
+ }
+
+ x /= N();
+ y /= N();
+
+ return new Point(x, y);
+ }
+}
diff --git a/src/sort/KDT.java b/src/sort/KDT.java
index 3e9f11395813107dbfa9e981689fdc378a70f361..cb6b9bc21953ff04f2cfba118aab87cec794d21e 100644
--- a/src/sort/KDT.java
+++ b/src/sort/KDT.java
@@ -1,7 +1,5 @@
package sort;
-import sandbox.Point;
-
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -10,6 +8,8 @@ import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.ArrayList;
+import sandbox.Point;
+
public class KDT<KeyVal extends Comparable<KeyVal>> implements Serializable {
/**
*
@@ -22,8 +22,8 @@ public class KDT<KeyVal extends Comparable<KeyVal>> implements Serializable {
ArrayList<GeneralCompare<KeyVal>> axes;
public static void main(String[] args) {
- GeneralCompare<Point> compX = (p1, p2) -> ((Point) p1).getX() - ((Point) p2).getX();
- GeneralCompare<Point> compY = (p1, p2) -> ((Point) p1).getY() - ((Point) p2).getY();
+ GeneralCompare<Point> compX = (p1, p2) -> (int) ((Point) p1).getX() - (int) ((Point) p2).getX();
+ GeneralCompare<Point> compY = (p1, p2) -> (int) ((Point) p1).getY() - (int) ((Point) p2).getY();
//(2,3), (4,7), (5,4), (7,2), (8,1), (9,6)
//(8,1), (7,2), (2,3), (5,4), (9,6), (4,7)
diff --git a/src/web/Director.java b/src/web/Director.java
index 6225be3a4d45618d1fd4e4934f380599fcb91a00..669a712f8ce27b54b2008fef2ff9b5ea73ada418 100755
--- a/src/web/Director.java
+++ b/src/web/Director.java
@@ -2,10 +2,14 @@ package web;
import javax.servlet.*;
import javax.servlet.http.*;
+
+import data.Record;
+
import java.io.*;
import java.util.*;
//import com.example.model.TrawlExpert; // notice this
import model.*; // notice this
+import search.BasicSearchResult;
public class Director extends HttpServlet {
@@ -14,11 +18,13 @@ public class Director extends HttpServlet {
//if (req == "doBioLookup.do")
//doBioLookup(request, response);
- TrawlExpert te = (TrawlExpert)request.getServletContext().getAttribute("trawl");
+ TrawlExpert te = (TrawlExpert) request.getServletContext().getAttribute("trawl");
//very basic example of listing all species
- Iterable<Integer> result = te.listAllSpecies();
+ // Iterable<Integer> result = te.listAllSpecies();
+
+ BasicSearchResult result = te.rangeSearch(159512, 1960, 2016);
- request.setAttribute("species", result);
+ request.setAttribute("results", result);
RequestDispatcher view = request.getRequestDispatcher("result.jsp");
view.forward(request, response);
}
diff --git a/tomcat/bin/catalina.sh b/tomcat/bin/catalina.sh
old mode 100644
new mode 100755
diff --git a/tomcat/bin/shutdown.sh b/tomcat/bin/shutdown.sh
old mode 100644
new mode 100755
diff --git a/tomcat/bin/startup.sh b/tomcat/bin/startup.sh
old mode 100644
new mode 100755
diff --git a/tomcat/webapps/Trawl/WEB-INF/classes/sandbox/.classpath b/tomcat/webapps/Trawl/WEB-INF/classes/sandbox/.classpath
new file mode 100644
index 0000000000000000000000000000000000000000..ac37fb2e4bca5ec7510383d7e55ea7b6b759e05a
--- /dev/null
+++ b/tomcat/webapps/Trawl/WEB-INF/classes/sandbox/.classpath
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tomcat/webapps/Trawl/WEB-INF/classes/sandbox/.project b/tomcat/webapps/Trawl/WEB-INF/classes/sandbox/.project
new file mode 100644
index 0000000000000000000000000000000000000000..ff1db54e8e75fcedb2a0b27c0661b0b6c87fc009
--- /dev/null
+++ b/tomcat/webapps/Trawl/WEB-INF/classes/sandbox/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>sandbox</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/tomcat/webapps/Trawl/result.jsp b/tomcat/webapps/Trawl/result.jsp
index 9ebd56779f74fb31e1f6871ce11c8470d54770fd..61848365c86730b9f99fd382a4cc94e7071909f1 100644
--- a/tomcat/webapps/Trawl/result.jsp
+++ b/tomcat/webapps/Trawl/result.jsp
@@ -1,14 +1,35 @@
-<%@ page import="java.util.*" %>
+<%@page import="search.BasicSearchResult"%>
+<%@ page import="java.util.*, data.Record, model.TrawlExpert" %>
<html>
<body>
<h1 align="center">Trawl Results</h1>
<p>
+<table>
+<tr>
+ <th>Scientific Name</th>
+ <th>Year</th>
+ <th>Month</th>
+ <th>Day</th>
+ <th>Latitude</th>
+ <th>Longitude</th>
+ <th>Individual Count</th>
+</tr>
<%
- Iterable<Integer> species = (Iterable<Integer>)request.getAttribute("species");
- for (Integer s: species)
- out.print("SpeciesID: " + s + "<br>");
- out.print((String) request.getAttribute("url"));
+ 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");
+ }
%>
+</table>
</body>
</html>
\ No newline at end of file
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 21fd28856e91315da464559a24ce0739d18f6a78..96c9919315a8ac4d87491aaf561b754c8b992f70 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,7 +1,7 @@
/*
* Generated by the Jasper component of Apache Tomcat
* Version: Apache Tomcat/9.0.6
- * Generated at: 2018-03-12 20:39:19 UTC
+ * Generated at: 2018-03-27 23:07:19 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.
@@ -111,8 +111,8 @@ public final class index_jsp extends org.apache.jasper.runtime.HttpJspBase
out = pageContext.getOut();
_jspx_out = out;
- out.write("\r\n");
- out.write("\r\n");
+ out.write('\n');
+ out.write('\n');
java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy");
request.setAttribute("year", sdf.format(new java.util.Date()));
@@ -120,302 +120,302 @@ 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("\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>\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("</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>\r\n");
+ 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>\r\n");
+ 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>\r\n");
+ 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>\r\n");
- out.write(" <span id=\"nav-wiki\"><a href=\"http://wiki.apache.org/tomcat/FrontPage\">Wiki</a></span>\r\n");
+ 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>\r\n");
+ 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>\r\n");
- out.write(" <br class=\"separator\" />\r\n");
- out.write(" </div>\r\n");
- out.write(" <div id=\"asf-box\">\r\n");
+ 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>\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("</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>\r\n");
+ 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>\r\n");
+ 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>\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("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>\r\n");
+ 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>\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("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>\r\n");
+ 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>\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("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>\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("\">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>\r\n");
- out.write(" <br />\r\n");
+ 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>\r\n");
+ 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>\r\n");
+ 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>\r\n");
+ 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>\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("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>\r\n");
+ 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>\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("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>\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("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>\r\n");
- out.write(" <p>The following mailing lists are available:</p>\r\n");
- out.write(" <ul>\r\n");
+ 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 />\r\n");
- out.write(" Important announcements, releases, security vulnerability notifications. (Low volume).</strong>\r\n");
- out.write(" </li>\r\n");
+ 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 />\r\n");
- out.write(" User support and discussion\r\n");
- out.write(" </li>\r\n");
+ 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 />\r\n");
+ 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>\r\n");
- out.write(" </li>\r\n");
+ 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 />\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("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>\r\n");
+ 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>\r\n");
+ 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>\r\n");
+ 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>\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("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>\r\n");
+ 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>\r\n");
+ 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>\r\n");
+ 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>\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("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>\r\n");
+ 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>\r\n");
+ 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>\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("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>\r\n");
+ 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>\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("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>\r\n");
+ 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>\r\n");
- out.write(" <li><a href=\"http://www.apache.org\">Apache Home</a></li>\r\n");
+ 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>\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("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>\r\n");
- out.write(" </div>\r\n");
- out.write(" </body>\r\n");
- out.write("\r\n");
- out.write("</html>\r\n");
+ 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;
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 aab6c18a470b964a5035124d685af1c0cd268d1b..bfa0be71e488ffcd8dc0d7c37bed15464933faf9 100644
--- a/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/index_jsp.java
+++ b/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/index_jsp.java
@@ -1,7 +1,7 @@
/*
* Generated by the Jasper component of Apache Tomcat
* Version: Apache Tomcat/9.0.6
- * Generated at: 2018-03-22 23:33:57 UTC
+ * Generated at: 2018-03-27 23:07:59 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.
@@ -212,7 +212,7 @@ public final class index_jsp extends org.apache.jasper.runtime.HttpJspBase
out.write(" <input type=\"radio\" name=\"gender\" value=\"female\"> Histogram\n");
out.write(" <input type=\"submit\">\n");
out.write(" </form>\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");
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 6a8a4c5aaf32297ae2ab7b85b11147c8f9406383..6df0726c5606860db28aef0ab3299cb03c9e07df 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,7 +1,7 @@
/*
* Generated by the Jasper component of Apache Tomcat
* Version: Apache Tomcat/9.0.6
- * Generated at: 2018-03-22 23:11:01 UTC
+ * 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.
@@ -11,7 +11,10 @@ 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,
@@ -32,7 +35,10 @@ public final class result_jsp extends org.apache.jasper.runtime.HttpJspBase
_jspx_imports_packages.add("java.util");
_jspx_imports_packages.add("javax.servlet.http");
_jspx_imports_packages.add("javax.servlet.jsp");
- _jspx_imports_classes = null;
+ _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;
@@ -115,19 +121,40 @@ public final class result_jsp extends org.apache.jasper.runtime.HttpJspBase
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");
-
- Iterable<Integer> species = (Iterable<Integer>)request.getAttribute("species");
- for (Integer s: species)
- out.print("SpeciesID: " + s + "<br>");
- out.print((String) request.getAttribute("url"));
+ 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) {