Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access: [2447] trunk/archive-access/projects/wayback/ wayback-webapp/src/main/webapp
|
From: <bra...@us...> - 2008-07-15 01:30:04
|
Revision: 2447
http://archive-access.svn.sourceforge.net/archive-access/?rev=2447&view=rev
Author: bradtofel
Date: 2008-07-14 18:30:13 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
REFACTOR(major) of all .jsp files to use simplified UIResults interface, instead of all the previous subclasses. Also now all .jsp files now use convenience methods on underlying objects within the UIResults.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/advanced_search.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/CSSError.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/HTMLError.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/JavaScriptError.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/XMLError.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/help.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/index.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/CalendarResults.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/HTMLCaptureResults.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/HTMLUrlResults.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/XMLCaptureResults.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/XMLUrlResults.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ArchiveComment.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ClientSideJSInsert.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Disclaimer.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/JSLessTimeline.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ResultMeta.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Timeline.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/UI-footer.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/UI-header.jsp
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/advanced_search.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/advanced_search.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/advanced_search.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -3,7 +3,7 @@
<jsp:include page="/template/UI-header.jsp" flush="true" />
<%
-UIResults results = UIResults.getFromRequest(request);
+UIResults results = UIResults.getGeneric(request);
StringFormatter fmt = results.getFormatter();
%>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/CSSError.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/CSSError.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/CSSError.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -3,10 +3,9 @@
<%@ page import="org.archive.wayback.core.UIResults" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
<%
-
-WaybackException e = (WaybackException) request.getAttribute("exception");
-UIResults results = UIResults.getFromRequest(request);
-StringFormatter fmt = results.getFormatter();
+UIResults results = UIResults.extractException(request);
+WaybackException e = results.getException();
+StringFormatter fmt = results.getWbRequest().getFormatter();
response.setStatus(e.getStatus());
%>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/HTMLError.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/HTMLError.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/HTMLError.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -3,14 +3,14 @@
<%@ page import="org.archive.wayback.core.UIResults" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
<%
-WaybackException e = (WaybackException) request.getAttribute("exception");
+UIResults results = UIResults.extractException(request);
+WaybackException e = results.getException();
e.setupResponse(response);
%>
<jsp:include page="/template/UI-header.jsp" flush="true" />
<%
-UIResults results = UIResults.getFromRequest(request);
-StringFormatter fmt = results.getFormatter();
+StringFormatter fmt = results.getWbRequest().getFormatter();
%>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/JavaScriptError.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/JavaScriptError.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/JavaScriptError.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -4,9 +4,9 @@
<%@ page import="org.archive.wayback.util.StringFormatter" %>
<%
-WaybackException e = (WaybackException) request.getAttribute("exception");
-UIResults results = UIResults.getFromRequest(request);
-StringFormatter fmt = results.getFormatter();
+UIResults results = UIResults.extractException(request);
+WaybackException e = results.getException();
+StringFormatter fmt = results.getWbRequest().getFormatter();
response.setStatus(e.getStatus());
%>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/XMLError.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/XMLError.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/exception/XMLError.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -5,9 +5,9 @@
<%@ page import="org.archive.wayback.util.StringFormatter" %>
<%
-WaybackException e = (WaybackException) request.getAttribute("exception");
-UIResults results = UIResults.getFromRequest(request);
-StringFormatter fmt = results.getFormatter();
+UIResults results = UIResults.extractException(request);
+WaybackException e = results.getException();
+StringFormatter fmt = results.getWbRequest().getFormatter();
//response.setStatus(e.getStatus());
%>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/help.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/help.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/help.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -2,7 +2,7 @@
<%@ page import="org.archive.wayback.util.StringFormatter" %>
<jsp:include page="/template/UI-header.jsp" flush="true" />
<%
-UIResults results = UIResults.getFromRequest(request);
+UIResults results = UIResults.getGeneric(request);
StringFormatter fmt = results.getFormatter();
String url = "http://archive-access.sourceforge.net/projects/wayback/faq.html";
%>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/index.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/index.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/index.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -3,7 +3,7 @@
<%@ page import="org.archive.wayback.util.StringFormatter" %>
<jsp:include page="template/UI-header.jsp" flush="true" />
<%
-UIResults results = UIResults.getFromRequest(request);
+UIResults results = UIResults.getGeneric(request);
StringFormatter fmt = results.getFormatter();
Object names = request.getAttribute("AccessPointNames");
if(names != null) {
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/CalendarResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/CalendarResults.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/CalendarResults.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -5,32 +5,31 @@
<%@ page import="java.text.ParseException" %>
<%@ page import="org.archive.wayback.WaybackConstants" %>
<%@ page import="org.archive.wayback.core.CaptureSearchResult" %>
-<%@ page import="org.archive.wayback.core.Timestamp" %>
+<%@ page import="org.archive.wayback.core.CaptureSearchResults" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
-<%@ page import="org.archive.wayback.query.UICaptureQueryResults" %>
+<%@ page import="org.archive.wayback.core.WaybackRequest" %>
<%@ page import="org.archive.wayback.query.resultspartitioner.ResultsPartitionsFactory" %>
<%@ page import="org.archive.wayback.query.resultspartitioner.ResultsPartition" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
<jsp:include page="/template/UI-header.jsp" flush="true" />
+<jsp:include page="/template/CookieJS.jsp" flush="true" />
<%
+UIResults results = UIResults.extractCaptureQuery(request);
-UICaptureQueryResults results = (UICaptureQueryResults) UIResults.getFromRequest(request);
-StringFormatter fmt = results.getFormatter();
-String searchString = results.getSearchUrl();
+WaybackRequest wbRequest = results.getWbRequest();
+CaptureSearchResults cResults = results.getCaptureResults();
+StringFormatter fmt = wbRequest.getFormatter();
+String searchString = wbRequest.getRequestUrl();
-Date searchStartDate = results.getStartTimestamp().getDate();
-Date searchEndDate = results.getEndTimestamp().getDate();
-long firstResult = results.getFirstResult();
-long lastResult = results.getLastResult();
-long resultCount = results.getResultsMatching();
-//Timestamp searchStartTs = results.getStartTimestamp();
-//Timestamp searchEndTs = results.getEndTimestamp();
-//String prettySearchStart = results.prettyDateFull(searchStartTs.getDate());
-//String prettySearchEnd = results.prettyDateFull(searchEndTs.getDate());
+Date searchStartDate = wbRequest.getStartDate();
+Date searchEndDate = wbRequest.getEndDate();
+long firstResult = cResults.getFirstReturned();
+long lastResult = cResults.getReturnedCount() + firstResult;
+long resultCount = cResults.getMatchingCount();
-ArrayList<ResultsPartition> partitions = ResultsPartitionsFactory.get(
- results.getResults(),results.getWbRequest());
+ArrayList<ResultsPartition> partitions =
+ ResultsPartitionsFactory.get(cResults, wbRequest);
int numPartitions = partitions.size();
%>
<table border="0" cellpadding="5" width="100%" class="mainSearchBanner" cellspacing="0">
@@ -39,6 +38,13 @@
<%= fmt.format("PathQueryClassic.searchedFor",searchString) %>
</td>
<td align="right">
+ <select onchange="SetAnchorWindow(this.value)">
+ <option value="86400">1 day</option>
+ <option value="604800">1 week</option>
+ <option value="2592000">1 month</option>
+ <option value="31536000">1 year</option>
+ <option value="315360000">10 years</option>
+ </select>
<%= fmt.format("PathQueryClassic.resultsSummary",resultCount) %>
</td>
</tr>
@@ -108,10 +114,10 @@
CaptureSearchResult result = partitionResults.get(j);
String url = result.getUrlKey();
- String captureDate = result.getCaptureTimestamp();
- Timestamp captureTS = Timestamp.parseBefore(captureDate);
+ String captureTimestamp = result.getCaptureTimestamp();
+ Date captureDate = result.getCaptureDate();
String prettyDate = fmt.format("PathQuery.classicResultLinkText",
- captureTS.getDate());
+ captureDate);
String origHost = result.getOriginalHost();
String MD5 = result.getDigest();
String redirectFlag = (0 == result.getRedirectUrl().compareTo("-"))
@@ -134,7 +140,7 @@
}
String updateStar = updated ? "*" : "";
%>
- <a href="<%= replayUrl %>"><%= prettyDate %></a> <%= updateStar %><br></br>
+ <a onclick="SetAnchorDate('<%= captureTimestamp %>');" href="<%= replayUrl %>"><%= prettyDate %></a> <%= updateStar %><br></br>
<%
}
@@ -153,12 +159,12 @@
<%
// show page indicators:
-if(results.getNumPages() > 1) {
- int curPage = results.getCurPage();
+if(cResults.getNumPages() > 1) {
+ int curPage = cResults.getCurPageNum();
%>
<hr></hr>
<%
- for(int i = 1; i <= results.getNumPages(); i++) {
+ for(int i = 1; i <= cResults.getNumPages(); i++) {
if(i == curPage) {
%>
<b><%= i %></b>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/HTMLCaptureResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/HTMLCaptureResults.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/HTMLCaptureResults.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -4,27 +4,26 @@
<%@ page import="java.util.Date" %>
<%@ page import="org.archive.wayback.WaybackConstants" %>
<%@ page import="org.archive.wayback.core.CaptureSearchResult" %>
-<%@ page import="org.archive.wayback.core.Timestamp" %>
+<%@ page import="org.archive.wayback.core.CaptureSearchResults" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
-<%@ page import="org.archive.wayback.query.UICaptureQueryResults" %>
+<%@ page import="org.archive.wayback.core.WaybackRequest" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
<jsp:include page="/template/UI-header.jsp" flush="true" />
<%
-UICaptureQueryResults results = (UICaptureQueryResults) UIResults.getFromRequest(request);
-StringFormatter fmt = results.getFormatter();
+UIResults results = UIResults.extractCaptureQuery(request);
+WaybackRequest wbRequest = results.getWbRequest();
+CaptureSearchResults cResults = results.getCaptureResults();
+StringFormatter fmt = wbRequest.getFormatter();
-String searchString = results.getSearchUrl();
+String searchString = wbRequest.getRequestUrl();
-long resultCount = results.getResultsReturned();
+long resultCount = cResults.getReturnedCount();
+Date searchStartDate = wbRequest.getStartDate();
+Date searchEndDate = wbRequest.getEndDate();
- Timestamp searchStartTs = results.getStartTimestamp();
- Timestamp searchEndTs = results.getEndTimestamp();
- Date searchStartDate = searchStartTs.getDate();
- Date searchEndDate = searchEndTs.getDate();
-
- Iterator<CaptureSearchResult> itr = results.resultsIterator();
- %>
+Iterator<CaptureSearchResult> itr = cResults.iterator();
+%>
<%= fmt.format("PathQuery.resultsSummary",resultCount,searchString) %>
<br></br>
<%= fmt.format("PathQuery.resultRange",searchStartDate,searchEndDate) %>
@@ -87,17 +86,17 @@
}
// show page indicators:
-int curPage = results.getCurPage();
-if(curPage > results.getNumPages()) {
+int curPage = cResults.getCurPageNum();
+if(curPage > cResults.getNumPages()) {
%>
<hr></hr>
<a href="<%= results.urlForPage(1) %>">First results</a>
<%
-} else if(results.getNumPages() > 1) {
+} else if(cResults.getNumPages() > 1) {
%>
<hr></hr>
<%
- for(int i = 1; i <= results.getNumPages(); i++) {
+ for(int i = 1; i <= cResults.getNumPages(); i++) {
if(i == curPage) {
%>
<b><%= i %></b>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/HTMLUrlResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/HTMLUrlResults.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/HTMLUrlResults.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -2,35 +2,35 @@
<%@ page import="java.util.Iterator" %>
<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.Date" %>
+<%@ page import="org.archive.wayback.ResultURIConverter" %>
<%@ page import="org.archive.wayback.WaybackConstants" %>
-<%@ page import="org.archive.wayback.core.Timestamp" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
<%@ page import="org.archive.wayback.core.UrlSearchResult" %>
-<%@ page import="org.archive.wayback.query.UIUrlQueryResults" %>
+<%@ page import="org.archive.wayback.core.UrlSearchResults" %>
+<%@ page import="org.archive.wayback.core.WaybackRequest" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
<jsp:include page="/template/UI-header.jsp" flush="true" />
<%
-UIUrlQueryResults results = (UIUrlQueryResults) UIResults.getFromRequest(request);
-StringFormatter fmt = results.getFormatter();
+UIResults results = UIResults.extractUrlQuery(request);
+WaybackRequest wbRequest = results.getWbRequest();
+UrlSearchResults uResults = results.getUrlResults();
+ResultURIConverter uriConverter = results.getURIConverter();
+StringFormatter fmt = wbRequest.getFormatter();
-String searchString = results.getSearchUrl();
+String searchString = wbRequest.getRequestUrl();
-Date searchStartDate = results.getStartTimestamp().getDate();
-Date searchEndDate = results.getEndTimestamp().getDate();
+Date searchStartDate = wbRequest.getStartDate();
+Date searchEndDate = wbRequest.getEndDate();
-//PathQuerySearchResultPartitioner partitioner =
-// new PathQuerySearchResultPartitioner(results.getResults(),
-// results.getURIConverter());
+long firstResult = uResults.getFirstReturned();
+long resultCount = uResults.getReturnedCount();
+long lastResult = resultCount + firstResult;
-long firstResult = results.getFirstResult();
-long lastResult = results.getLastResult();
-long resultCount = results.getResultsMatching();
+long totalCaptures = uResults.getMatchingCount();
-long totalCaptures = results.getResultsMatching();
-
%>
<%= fmt.format("PathPrefixQuery.showingResults",firstResult,lastResult,
resultCount,searchString) %>
@@ -38,22 +38,23 @@
<hr></hr>
<%
-Iterator<UrlSearchResult> itr = results.resultsIterator();
+Iterator<UrlSearchResult> itr = uResults.iterator();
while(itr.hasNext()) {
UrlSearchResult result = itr.next();
String urlKey = result.getUrlKey();
String originalUrl = result.getOriginalUrl();
- String firstDateTS = result.getFirstCaptureTimestamp();
- String lastDateTS = result.getLastCaptureTimestamp();
+ String firstDateTSss = result.getFirstCaptureTimestamp();
+ String lastDateTSss = result.getLastCaptureTimestamp();
long numCaptures = result.getNumCaptures();
long numVersions = result.getNumVersions();
- Date firstDate = results.timestampToDate(firstDateTS);
- Date lastDate = results.timestampToDate(lastDateTS);
+ Date firstDate = result.getFirstCaptureDate();
+ Date lastDate = result.getLastCaptureDate();
if(numCaptures == 1) {
- String anchor = results.makeReplayUrl(originalUrl,firstDateTS);
+ String ts = result.getFirstCaptureTimestamp();
+ String anchor = uriConverter.makeReplayURI(ts,originalUrl);
%>
<a href="<%= anchor %>">
<%= urlKey %>
@@ -89,17 +90,17 @@
}
// show page indicators:
-int curPage = results.getCurPage();
-if(curPage > results.getNumPages()) {
+int curPage = uResults.getCurPageNum();
+if(curPage > uResults.getNumPages()) {
%>
<hr></hr>
<a href="<%= results.urlForPage(1) %>">First results</a>
<%
-} else if(results.getNumPages() > 1) {
+} else if(uResults.getNumPages() > 1) {
%>
<hr></hr>
<%
- for(int i = 1; i <= results.getNumPages(); i++) {
+ for(int i = 1; i <= uResults.getNumPages(); i++) {
if(i == curPage) {
%>
<b><%= i %></b>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/XMLCaptureResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/XMLCaptureResults.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/XMLCaptureResults.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -7,14 +7,12 @@
<%@ page import="org.archive.wayback.core.CaptureSearchResult" %>
<%@ page import="org.archive.wayback.core.CaptureSearchResults" %>
<%@ page import="org.archive.wayback.core.SearchResults" %>
-<%@ page import="org.archive.wayback.core.Timestamp" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
-<%@ page import="org.archive.wayback.query.UICaptureQueryResults" %>
<%
-UICaptureQueryResults uiResults = (UICaptureQueryResults) UIResults.getFromRequest(request);
+UIResults uiResults = UIResults.extractCaptureQuery(request);
-CaptureSearchResults results = uiResults.getResults();
-Iterator<CaptureSearchResult> itr = uiResults.resultsIterator();
+CaptureSearchResults results = uiResults.getCaptureResults();
+Iterator<CaptureSearchResult> itr = results.iterator();
%>
<wayback>
<request>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/XMLUrlResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/XMLUrlResults.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/XMLUrlResults.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -5,16 +5,14 @@
<%@ page import="java.util.Map" %>
<%@ page import="java.util.Enumeration" %>
<%@ page import="org.archive.wayback.core.SearchResults" %>
-<%@ page import="org.archive.wayback.core.Timestamp" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
<%@ page import="org.archive.wayback.core.UrlSearchResults" %>
<%@ page import="org.archive.wayback.core.UrlSearchResult" %>
-<%@ page import="org.archive.wayback.query.UIUrlQueryResults" %>
<%
-UIUrlQueryResults uiResults = (UIUrlQueryResults) UIResults.getFromRequest(request);
+UIResults uiResults = UIResults.extractUrlQuery(request);
-UrlSearchResults results = uiResults.getResults();
-Iterator<UrlSearchResult> itr = uiResults.resultsIterator();
+UrlSearchResults results = uiResults.getUrlResults();
+Iterator<UrlSearchResult> itr = results.iterator();
%>
<wayback>
<request>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ArchiveComment.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ArchiveComment.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ArchiveComment.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -1,12 +1,10 @@
<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%@ page import="java.util.Date" %>
-<%@ page import="org.archive.wayback.core.Timestamp" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
-<%@ page import="org.archive.wayback.replay.UIReplayResult" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
<%
-UIReplayResult results = (UIReplayResult) UIResults.getFromRequest(request);
-StringFormatter fmt = results.getFormatter();
+UIResults results = UIResults.extractReplay(request);
+StringFormatter fmt = results.getWbRequest().getFormatter();
Date exactDate = results.getResult().getCaptureDate();
Date now = new Date();
String prettyDateFormat = "{0,date,H:mm:ss MMM d, yyyy}";
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ClientSideJSInsert.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ClientSideJSInsert.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ClientSideJSInsert.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -1,15 +1,13 @@
<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%@ page import="java.util.Date" %>
<%@ page import="org.archive.wayback.ResultURIConverter" %>
-<%@ page import="org.archive.wayback.core.Timestamp" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
<%@ page import="org.archive.wayback.core.WaybackRequest" %>
-<%@ page import="org.archive.wayback.replay.UIReplayResult" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
<%
-UIReplayResult results = (UIReplayResult) UIResults.getFromRequest(request);
+UIResults results = UIResults.extractReplay(request);
String requestDate = results.getResult().getCaptureTimestamp();
-String contextPath = results.makeReplayUrl("",requestDate);
+String contextPath = results.getURIConverter().makeReplayURI(requestDate,"");
String contextRoot = request.getScheme() + "://" + request.getServerName() + ":"
+ request.getServerPort() + request.getContextPath();
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Disclaimer.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Disclaimer.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Disclaimer.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -1,27 +1,24 @@
<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%@ page import="java.util.Date" %>
<%@ page import="org.archive.wayback.WaybackConstants" %>
-<%@ page import="org.archive.wayback.core.Timestamp" %>
<%@ page import="org.archive.wayback.core.CaptureSearchResult" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
<%@ page import="org.archive.wayback.core.WaybackRequest" %>
-<%@ page import="org.archive.wayback.replay.UIReplayResult" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
<%
-UIReplayResult results = (UIReplayResult) UIResults.getFromRequest(request);
+UIResults results = UIResults.extractReplay(request);
-StringFormatter fmt = results.getFormatter();
+StringFormatter fmt = results.getWbRequest().getFormatter();
CaptureSearchResult result = results.getResult();
String dupeMsg = "";
if(result != null) {
if(result.isDuplicateDigest()) {
- String dupeDate = result.getDuplicateDigestStoredTimestamp();
+ Date dupeDate = result.getDuplicateDigestStoredDate();
String prettyDate = "";
if(dupeDate != null) {
- Timestamp dupeTS = Timestamp.parseBefore(dupeDate);
prettyDate = "(" +
fmt.format("MetaReplay.captureDateDisplay",
- dupeTS.getDate()) + ")";
+ dupeDate) + ")";
}
dupeMsg = " Note that this document was downloaded, and not saved because it was a duplicate of a previously captured version " +
prettyDate + ". HTTP headers presented here are from the original capture.";
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/JSLessTimeline.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/JSLessTimeline.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/JSLessTimeline.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -6,10 +6,8 @@
<%@ page import="org.archive.wayback.WaybackConstants" %>
<%@ page import="org.archive.wayback.core.CaptureSearchResult" %>
<%@ page import="org.archive.wayback.core.CaptureSearchResults" %>
-<%@ page import="org.archive.wayback.core.Timestamp" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
<%@ page import="org.archive.wayback.core.WaybackRequest" %>
-<%@ page import="org.archive.wayback.replay.UIReplayResult" %>
<%@ page import="org.archive.wayback.query.resultspartitioner.ResultsTimelinePartitionsFactory" %>
<%@ page import="org.archive.wayback.query.resultspartitioner.ResultsPartition" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
@@ -18,24 +16,21 @@
String contextRoot = request.getScheme() + "://" + request.getServerName() + ":"
+ request.getServerPort() + request.getContextPath();
-UIReplayResult results = (UIReplayResult) UIResults.getFromRequest(request);
-StringFormatter fmt = results.getFormatter();
+UIResults results = UIResults.extractReplay(request);
WaybackRequest wbRequest = results.getWbRequest();
-CaptureSearchResults cResults = results.getResults();
+StringFormatter fmt = wbRequest.getFormatter();
+CaptureSearchResults cResults = results.getCaptureResults();
-String exactDateStr = wbRequest.get(WaybackConstants.REQUEST_DATE);
-String searchUrl = wbRequest.get(WaybackConstants.REQUEST_URL);
-String resolution = wbRequest.get(WaybackConstants.REQUEST_RESOLUTION);
-String metaMode = wbRequest.get(WaybackConstants.REQUEST_META_MODE);
+String exactDateStr = wbRequest.getReplayTimestamp();
+Date exactDate = wbRequest.getReplayDate();
+String searchUrl = wbRequest.getRequestUrl();
+String resolution = wbRequest.getTimelineResolution();
-Date exactDate = Timestamp.parseBefore(exactDateStr).getDate();
-
-
if(resolution == null) {
- resolution = WaybackConstants.REQUEST_RESOLUTION_AUTO;
+ resolution = WaybackRequest.REQUEST_RESOLUTION_AUTO;
}
String metaChecked = "";
-if(metaMode != null && metaMode.equals("yes")) {
+if(wbRequest.isMetaMode()) {
metaChecked = "checked";
}
@@ -49,8 +44,9 @@
Iterator<CaptureSearchResult> it = cResults.iterator();
while(it.hasNext()) {
CaptureSearchResult res = it.next();
- String resDateStr = res.getCaptureTimestamp();
- int compared = resDateStr.compareTo(exactDateStr.substring(0,resDateStr.length()));
+ Date resDate = res.getCaptureDate();
+
+ int compared = resDate.compareTo(exactDate);
if(compared < 0) {
resultIndex++;
prev = res;
@@ -74,15 +70,15 @@
String minResolution = ResultsTimelinePartitionsFactory.getMinResolution(cResults);
String optimal = "";
-if(minResolution.equals(WaybackConstants.REQUEST_RESOLUTION_HOURS)) {
+if(minResolution.equals(WaybackRequest.REQUEST_RESOLUTION_HOURS)) {
optimal = fmt.format("TimelineView.timeRange.hours");
-} else if(minResolution.equals(WaybackConstants.REQUEST_RESOLUTION_DAYS)) {
+} else if(minResolution.equals(WaybackRequest.REQUEST_RESOLUTION_DAYS)) {
optimal = fmt.format("TimelineView.timeRange.days");
-} else if(minResolution.equals(WaybackConstants.REQUEST_RESOLUTION_MONTHS)) {
+} else if(minResolution.equals(WaybackRequest.REQUEST_RESOLUTION_MONTHS)) {
optimal = fmt.format("TimelineView.timeRange.months");
-} else if(minResolution.equals(WaybackConstants.REQUEST_RESOLUTION_TWO_MONTHS)) {
+} else if(minResolution.equals(WaybackRequest.REQUEST_RESOLUTION_TWO_MONTHS)) {
optimal = fmt.format("TimelineView.timeRange.twomonths");
-} else if(minResolution.equals(WaybackConstants.REQUEST_RESOLUTION_YEARS)) {
+} else if(minResolution.equals(WaybackRequest.REQUEST_RESOLUTION_YEARS)) {
optimal = fmt.format("TimelineView.timeRange.years");
} else {
optimal = fmt.format("TimelineView.timeRange.unknown");
@@ -90,30 +86,24 @@
String autoOptString = fmt.format("TimelineView.timeRange.auto",optimal);
ArrayList<ResultsPartition> partitions;
-if(resolution.equals(WaybackConstants.REQUEST_RESOLUTION_HOURS)) {
+if(resolution.equals(WaybackRequest.REQUEST_RESOLUTION_HOURS)) {
hoursOptSelected = "selected";
- partitions = ResultsTimelinePartitionsFactory.getHour(results.getResults(),
- wbRequest);
-} else if(resolution.equals(WaybackConstants.REQUEST_RESOLUTION_DAYS)) {
+ partitions = ResultsTimelinePartitionsFactory.getHour(cResults,wbRequest);
+} else if(resolution.equals(WaybackRequest.REQUEST_RESOLUTION_DAYS)) {
daysOptSelected = "selected";
- partitions = ResultsTimelinePartitionsFactory.getDay(results.getResults(),
- wbRequest);
-} else if(resolution.equals(WaybackConstants.REQUEST_RESOLUTION_MONTHS)) {
+ partitions = ResultsTimelinePartitionsFactory.getDay(cResults,wbRequest);
+} else if(resolution.equals(WaybackRequest.REQUEST_RESOLUTION_MONTHS)) {
monthsOptSelected = "selected";
- partitions = ResultsTimelinePartitionsFactory.getMonth(results.getResults(),
- wbRequest);
-} else if(resolution.equals(WaybackConstants.REQUEST_RESOLUTION_TWO_MONTHS)) {
+ partitions = ResultsTimelinePartitionsFactory.getMonth(cResults,wbRequest);
+} else if(resolution.equals(WaybackRequest.REQUEST_RESOLUTION_TWO_MONTHS)) {
monthsOptSelected = "selected";
- partitions = ResultsTimelinePartitionsFactory.getTwoMonth(results.getResults(),
- wbRequest);
-} else if(resolution.equals(WaybackConstants.REQUEST_RESOLUTION_YEARS)) {
+ partitions = ResultsTimelinePartitionsFactory.getTwoMonth(cResults,wbRequest);
+} else if(resolution.equals(WaybackRequest.REQUEST_RESOLUTION_YEARS)) {
yearsOptSelected = "selected";
- partitions = ResultsTimelinePartitionsFactory.getYear(results.getResults(),
- wbRequest);
+ partitions = ResultsTimelinePartitionsFactory.getYear(cResults,wbRequest);
} else {
autoOptSelected = "selected";
- partitions = ResultsTimelinePartitionsFactory.getAuto(results.getResults(),
- wbRequest);
+ partitions = ResultsTimelinePartitionsFactory.getAuto(cResults,wbRequest);
}
int numPartitions = partitions.size();
ResultsPartition firstP = (ResultsPartition) partitions.get(0);
@@ -283,9 +273,9 @@
<option <%= autoOptSelected %> value="auto"><%= autoOptString %></option>
</select> <%=
fmt.format("TimelineView.metaDataCheck")
- %><input type="checkbox" name="metamode" value="yes" <%=
+ %><input type="checkbox" name="<%= WaybackRequest.REQUEST_META_MODE%>" value="<%= WaybackRequest.REQUEST_YES %>" <%=
metaChecked
- %> onClick="changeMeta()"> 
+ %> onClick="changeMeta()">
</form>
-->
<a wmSpecial="1" href="<%= contextRoot %>/help.jsp" target="_top"><%=
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ResultMeta.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ResultMeta.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ResultMeta.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -1,24 +1,23 @@
<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%@ page import="java.util.Iterator" %>
<%@ page import="java.util.Map" %>
-<%@ page import="org.archive.wayback.core.Timestamp" %>
+<%@ page import="org.archive.wayback.core.CaptureSearchResult" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
-<%@ page import="org.archive.wayback.replay.UIReplayResult" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
<%
-UIReplayResult uiResults = (UIReplayResult) UIResults.getFromRequest(request);
-StringFormatter fmt = uiResults.getFormatter();
-
-String origUrl = uiResults.getOriginalUrl();
-String urlKey = uiResults.getUrlKey();
-String archiveID = uiResults.getArchiveID();
-Timestamp captureTS = uiResults.getCaptureTimestamp();
+UIResults uiResults = UIResults.extractReplay(request);
+StringFormatter fmt = uiResults.getWbRequest().getFormatter();
+CaptureSearchResult result = uiResults.getResult();
+String origUrl = result.getOriginalUrl();
+String urlKey = result.getUrlKey();
+String archiveID = result.getFile() + "/" + result.getOffset();
+String captureTS = result.getCaptureTimestamp();
String capturePrettyDateTime = fmt.format("MetaReplay.captureDateDisplay",
- captureTS.getDate());
-String mimeType = uiResults.getMimeType();
-String digest = uiResults.getDigest();
-Map<String,String> headers = uiResults.getHttpHeaders();
+ result.getCaptureDate());
+String mimeType = result.getMimeType();
+String digest = result.getDigest();
+Map<String,String> headers = uiResults.getResource().getHttpHeaders();
%>
<html>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Timeline.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Timeline.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Timeline.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -6,10 +6,8 @@
<%@ page import="org.archive.wayback.WaybackConstants" %>
<%@ page import="org.archive.wayback.core.CaptureSearchResult" %>
<%@ page import="org.archive.wayback.core.CaptureSearchResults" %>
-<%@ page import="org.archive.wayback.core.Timestamp" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
<%@ page import="org.archive.wayback.core.WaybackRequest" %>
-<%@ page import="org.archive.wayback.replay.UIReplayResult" %>
<%@ page import="org.archive.wayback.query.resultspartitioner.ResultsTimelinePartitionsFactory" %>
<%@ page import="org.archive.wayback.query.resultspartitioner.ResultsPartition" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
@@ -18,24 +16,22 @@
String contextRoot = request.getScheme() + "://" + request.getServerName() + ":"
+ request.getServerPort() + request.getContextPath();
-UIReplayResult results = (UIReplayResult) UIResults.getFromRequest(request);
-StringFormatter fmt = results.getFormatter();
+UIResults results = UIResults.extractReplay(request);
WaybackRequest wbRequest = results.getWbRequest();
-CaptureSearchResults cResults = results.getResults();
+StringFormatter fmt = wbRequest.getFormatter();
+CaptureSearchResults cResults = results.getCaptureResults();
-String exactDateStr = wbRequest.get(WaybackConstants.REQUEST_DATE);
-String searchUrl = wbRequest.get(WaybackConstants.REQUEST_URL);
-String resolution = wbRequest.get(WaybackConstants.REQUEST_RESOLUTION);
-String metaMode = wbRequest.get(WaybackConstants.REQUEST_META_MODE);
+String exactDateStr = wbRequest.getReplayTimestamp();
+Date exactDate = wbRequest.getReplayDate();
+String searchUrl = wbRequest.getRequestUrl();
+String resolution = wbRequest.getTimelineResolution();
-Date exactDate = Timestamp.parseBefore(exactDateStr).getDate();
-
if(resolution == null) {
- resolution = WaybackConstants.REQUEST_RESOLUTION_AUTO;
+ resolution = WaybackRequest.REQUEST_RESOLUTION_AUTO;
}
String metaChecked = "";
-if(metaMode != null && metaMode.equals("yes")) {
+if(wbRequest.isMetaMode()) {
metaChecked = "checked";
}
@@ -74,15 +70,15 @@
String minResolution = ResultsTimelinePartitionsFactory.getMinResolution(cResults);
String optimal = "";
-if(minResolution.equals(WaybackConstants.REQUEST_RESOLUTION_HOURS)) {
+if(minResolution.equals(WaybackRequest.REQUEST_RESOLUTION_HOURS)) {
optimal = fmt.format("TimelineView.timeRange.hours");
-} else if(minResolution.equals(WaybackConstants.REQUEST_RESOLUTION_DAYS)) {
+} else if(minResolution.equals(WaybackRequest.REQUEST_RESOLUTION_DAYS)) {
optimal = fmt.format("TimelineView.timeRange.days");
-} else if(minResolution.equals(WaybackConstants.REQUEST_RESOLUTION_MONTHS)) {
+} else if(minResolution.equals(WaybackRequest.REQUEST_RESOLUTION_MONTHS)) {
optimal = fmt.format("TimelineView.timeRange.months");
-} else if(minResolution.equals(WaybackConstants.REQUEST_RESOLUTION_TWO_MONTHS)) {
+} else if(minResolution.equals(WaybackRequest.REQUEST_RESOLUTION_TWO_MONTHS)) {
optimal = fmt.format("TimelineView.timeRange.twomonths");
-} else if(minResolution.equals(WaybackConstants.REQUEST_RESOLUTION_YEARS)) {
+} else if(minResolution.equals(WaybackRequest.REQUEST_RESOLUTION_YEARS)) {
optimal = fmt.format("TimelineView.timeRange.years");
} else {
optimal = fmt.format("TimelineView.timeRange.unknown");
@@ -90,30 +86,24 @@
String autoOptString = fmt.format("TimelineView.timeRange.auto",optimal);
ArrayList<ResultsPartition> partitions;
-if(resolution.equals(WaybackConstants.REQUEST_RESOLUTION_HOURS)) {
+if(resolution.equals(WaybackRequest.REQUEST_RESOLUTION_HOURS)) {
hoursOptSelected = "selected";
- partitions = ResultsTimelinePartitionsFactory.getHour(results.getResults(),
- wbRequest);
-} else if(resolution.equals(WaybackConstants.REQUEST_RESOLUTION_DAYS)) {
+ partitions = ResultsTimelinePartitionsFactory.getHour(cResults,wbRequest);
+} else if(resolution.equals(WaybackRequest.REQUEST_RESOLUTION_DAYS)) {
daysOptSelected = "selected";
- partitions = ResultsTimelinePartitionsFactory.getDay(results.getResults(),
- wbRequest);
-} else if(resolution.equals(WaybackConstants.REQUEST_RESOLUTION_MONTHS)) {
+ partitions = ResultsTimelinePartitionsFactory.getDay(cResults,wbRequest);
+} else if(resolution.equals(WaybackRequest.REQUEST_RESOLUTION_MONTHS)) {
monthsOptSelected = "selected";
- partitions = ResultsTimelinePartitionsFactory.getMonth(results.getResults(),
- wbRequest);
-} else if(resolution.equals(WaybackConstants.REQUEST_RESOLUTION_TWO_MONTHS)) {
+ partitions = ResultsTimelinePartitionsFactory.getMonth(cResults,wbRequest);
+} else if(resolution.equals(WaybackRequest.REQUEST_RESOLUTION_TWO_MONTHS)) {
monthsOptSelected = "selected";
- partitions = ResultsTimelinePartitionsFactory.getTwoMonth(results.getResults(),
- wbRequest);
-} else if(resolution.equals(WaybackConstants.REQUEST_RESOLUTION_YEARS)) {
+ partitions = ResultsTimelinePartitionsFactory.getTwoMonth(cResults,wbRequest);
+} else if(resolution.equals(WaybackRequest.REQUEST_RESOLUTION_YEARS)) {
yearsOptSelected = "selected";
- partitions = ResultsTimelinePartitionsFactory.getYear(results.getResults(),
- wbRequest);
+ partitions = ResultsTimelinePartitionsFactory.getYear(cResults,wbRequest);
} else {
autoOptSelected = "selected";
- partitions = ResultsTimelinePartitionsFactory.getAuto(results.getResults(),
- wbRequest);
+ partitions = ResultsTimelinePartitionsFactory.getAuto(cResults,wbRequest);
}
int numPartitions = partitions.size();
ResultsPartition firstP = (ResultsPartition) partitions.get(0);
@@ -305,7 +295,7 @@
<option <%= autoOptSelected %> value="auto"><%= autoOptString %></option>
</select> <%=
fmt.format("TimelineView.metaDataCheck")
- %><input type="checkbox" name="metamode" value="yes" <%=
+ %><input type="checkbox" name="<%= WaybackRequest.REQUEST_META_MODE %>" value="<%= WaybackRequest.REQUEST_YES %>" <%=
metaChecked
%> onClick="changeMeta()"> 
</form>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/UI-footer.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/UI-footer.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/UI-footer.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -2,10 +2,10 @@
<%@ page import="org.archive.wayback.core.UIResults" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
<%
-UIResults results = UIResults.getFromRequest(request);
-StringFormatter fmt = results.getFormatter();
-String contextRoot = results.getContextPrefix();
-String serverRoot = results.getServerPrefix();
+UIResults results = UIResults.getGeneric(request);
+StringFormatter fmt = results.getWbRequest().getFormatter();
+String contextRoot = results.getWbRequest().getContextPrefix();
+String serverRoot = results.getWbRequest().getServerPrefix();
%>
<!-- FOOTER -->
<div align="center">
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/UI-header.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/UI-header.jsp 2008-07-15 01:27:41 UTC (rev 2446)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/UI-header.jsp 2008-07-15 01:30:13 UTC (rev 2447)
@@ -1,25 +1,27 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<%@ page import="org.archive.wayback.core.WaybackRequest" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%
-UIResults results = UIResults.getFromRequest(request);
-StringFormatter fmt = results.getFormatter();
-String contextRoot = results.getContextPrefix();
-String serverRoot = results.getServerPrefix();
+UIResults results = UIResults.getGeneric(request);
+WaybackRequest wbRequest = results.getWbRequest();
+StringFormatter fmt = wbRequest.getFormatter();
+String contextRoot = wbRequest.getContextPrefix();
+String serverRoot = wbRequest.getServerPrefix();
%>
<!-- HEADER -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css"
href="<%= contextRoot %>css/styles.css"
- src="<%= contextRoot %>css/styles.css">
+ src="<%= contextRoot %>css/styles.css" />
<title><%= fmt.format("UIGlobal.pageTitle") %></title>
- <base target="_top">
+ <base target="_top" />
</head>
<body bgcolor="white" alink="red" vlink="#0000aa" link="blue"
@@ -64,13 +66,14 @@
<font size="2" color="#FFFFFF" face="Arial, Helvetica, sans-serif">
<%= fmt.format("UIGlobal.enterWebAddress") %>
</font>
- <input type="hidden" name="type" value="urlquery">
- <input type="text" name="url" value="http://" size="24" maxlength="256">
+ <input type="hidden" name="<%= WaybackRequest.REQUEST_TYPE %>" value="<%= WaybackRequest.REQUEST_CAPTURE_QUERY %>">
+ <input type="text" name="<%= WaybackRequest.REQUEST_URL %>" value="http://" size="24" maxlength="256">
</b>
- <select name="date" size="1">
+ <select name="<%= WaybackRequest.REQUEST_DATE %>" size="1">
<option value="" selected><%= fmt.format("UIGlobal.selectYearAll") %></option>
- <option>2007</option>
+ <option>2008</option>
+ <option>2007</option>
<option>2006</option>
<option>2005</option>
<option>2004</option>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
