From: <bra...@us...> - 2010-05-18 23:43:48
|
Revision: 3122 http://archive-access.svn.sourceforge.net/archive-access/?rev=3122&view=rev Author: bradtofel Date: 2010-05-18 23:43:42 +0000 (Tue, 18 May 2010) Log Message: ----------- now uses getQuery|Static|ReplayPrefix Added nav links to move forward/back in time with a ResourceNotAvailable Modified Paths: -------------- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/HTMLError.jsp Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/HTMLError.jsp =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/HTMLError.jsp 2010-05-18 23:41:18 UTC (rev 3121) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/exception/HTMLError.jsp 2010-05-18 23:43:42 UTC (rev 3122) @@ -1,17 +1,30 @@ <%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%> <%@ page import="java.util.List" %> +<%@ page import="java.util.Date" %> <%@ page import="org.archive.wayback.exception.WaybackException" %> <%@ page import="org.archive.wayback.exception.ResourceNotInArchiveException"%> +<%@ page import="org.archive.wayback.exception.ResourceNotAvailableException"%> +<%@ page import="org.archive.wayback.core.CaptureSearchResult" %> +<%@ page import="org.archive.wayback.core.CaptureSearchResults" %> <%@ page import="org.archive.wayback.core.UIResults" %> <%@ page import="org.archive.wayback.core.WaybackRequest" %> <%@ page import="org.archive.wayback.util.StringFormatter" %> <%@ page import="org.archive.wayback.util.url.UrlOperations" %> +<%@ page import="org.archive.wayback.partition.PartitionsToGraph" %> + +<%@ page import="org.archive.wayback.util.partition.Partitioner" %> +<%@ page import="org.archive.wayback.util.partition.Partition" %> +<%@ page import="org.archive.wayback.util.partition.PartitionSize" %> +<%@ page import="org.archive.wayback.partition.PartitionPartitionMap" %> +<%@page import="org.archive.wayback.exception.ResourceNotAvailableException"%> <% UIResults results = UIResults.extractException(request); WaybackException e = results.getException(); WaybackRequest wbr = results.getWbRequest(); e.setupResponse(response); -String contextRoot = wbr.getContextPrefix(); +String staticPrefix = wbr.getAccessPoint().getStaticPrefix(); +String queryPrefix = wbr.getAccessPoint().getQueryPrefix(); +String replayPrefix = wbr.getAccessPoint().getReplayPrefix(); String requestUrl = wbr.getRequestUrl(); %> @@ -19,7 +32,6 @@ <% StringFormatter fmt = results.getWbRequest().getFormatter(); - %> <h2><%= fmt.format(e.getTitleKey()) %></h2> @@ -36,7 +48,7 @@ WaybackRequest tmp = wbr.clone(); for(String closeMatch : closeMatches) { tmp.setRequestUrl(closeMatch); - String link = tmp.getContextPrefix() + "query?" + + String link = queryPrefix + "query?" + tmp.getQueryArguments(); %> <a href="<%= link %>"><%= closeMatch %></a><br> @@ -48,7 +60,7 @@ WaybackRequest tmp = wbr.clone(); tmp.setRequestUrl(parentUrl); tmp.setUrlQueryRequest(); - String link = tmp.getContextPrefix() + "query?" + + String link = queryPrefix + "query?" + tmp.getQueryArguments(); String escapedLink = fmt.escapeHtml(link); String escapedParentUrl = fmt.escapeHtml(parentUrl); @@ -60,6 +72,40 @@ </p> <% } +} else if(e instanceof ResourceNotAvailableException) { +%> + <div class="wm-nav-link-div"> + <% + CaptureSearchResults cResults = results.getCaptureResults(); + Date firstDate = cResults.getFirstResultDate(); + Date lastDate = cResults.getLastResultDate(); + PartitionPartitionMap yearMap = + new PartitionPartitionMap(); + PartitionSize yearSize = Partitioner.yearSize; + Partitioner<Partition<CaptureSearchResult>> yearPartitioner = + new Partitioner<Partition<CaptureSearchResult>>(yearMap); + + List<Partition<Partition<CaptureSearchResult>>> yearPartitions = + yearPartitioner.getRange(yearSize,firstDate,lastDate); + + String navs[] = PartitionsToGraph.getNavigators(fmt,results.getResult()); + String links[] = PartitionsToGraph.getNavigatorLinks(yearPartitions,results.getURIConverter()); + String searchUrl = wbr.getRequestUrl(); + String starLink = fmt.escapeHtml(queryPrefix + "*/" + searchUrl); + links[PartitionsToGraph.NAV_CURRENT] = starLink; + for(int i = 0; i < navs.length; i++) { + if(i > 0) { + %> <% + } + if(links[i] == null) { + %><%= navs[i] %><% + } else { + %> <a href="<%= links[i] %>"><%= navs[i] %></a> <% + } + } + %> + </div> +<% } %> <jsp:include page="/WEB-INF/template/UI-footer.jsp" flush="true" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |