Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access:[3165] trunk/archive-access/projects/wayback/ wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp
|
From: <bra...@us...> - 2010-07-06 22:22:18
|
Revision: 3165
http://archive-access.svn.sourceforge.net/archive-access/?rev=3165&view=rev
Author: bradtofel
Date: 2010-07-06 22:22:12 +0000 (Tue, 06 Jul 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp 2010-07-06 22:17:28 UTC (rev 3164)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp 2010-07-06 22:22:12 UTC (rev 3165)
@@ -9,7 +9,9 @@
%><%@ page import="org.archive.wayback.core.UrlSearchResults"
%><%@ page import="org.archive.wayback.core.WaybackRequest"
%><%@ page import="org.archive.wayback.util.StringFormatter"
-%><%
+%>
+<jsp:include page="/WEB-INF/global-template/UI-header.jsp" flush="true" />
+<%
UIResults results = UIResults.extractUrlQuery(request);
WaybackRequest wbRequest = results.getWbRequest();
UrlSearchResults uResults = results.getUrlResults();
@@ -17,9 +19,10 @@
StringFormatter fmt = wbRequest.getFormatter();
String searchString = wbRequest.getRequestUrl();
+String staticPrefix = results.getStaticPrefix();
+String queryPrefix = results.getQueryPrefix();
+String replayPrefix = results.getReplayPrefix();
-
-
Date searchStartDate = wbRequest.getStartDate();
Date searchEndDate = wbRequest.getEndDate();
@@ -29,11 +32,94 @@
long totalCaptures = uResults.getMatchingCount();
%>
-<%= fmt.format("PathPrefixQuery.showingResults",firstResult + 1,lastResult,
- totalCaptures,searchString) %>
-<br/>
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript"></script>
+<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.1/jquery-ui.min.js" type="text/javascript"></script>
+<script type="text/javascript" src="<%= staticPrefix %>js/jquery.dataTables.min.js" charset="utf-8"></script>
+<script type="text/javascript">
+$().ready(function(){
+ $(".dataTables_processing").show();
+ $('#resultsUrl th.url span').html(' ↑');
+ $('#resultsUrl th').mouseup(function(){
+ \$('#resultsUrl th span').html('');
+ \$(this).find('span').html(' ↑');
+ if (\$(this).hasClass('sorting_asc')) {
+ \$(this).find('span').html(' ↓');
+ } else if (\$(this).hasClass('sorting_desc')) {
+ \$(this).find('span').html(' ↑');
+ };
+ });
+ var rowCount = \$('#resultsUrl tbody tr').length;
+ if (rowCount < 50) {
+ \$('#resultsUrl').dataTable({
+ "bProcessing": true,
+ "aoColumns": [{"sType":"html"},{"sType":"date"},{"sType":"date"},null,null,null],
+ "aaSorting": [ [0,'asc'] ],
+ "bPaginate": false,
+ "bInfo": false,
+ "bFilter": true,
+ "bStateSave": true,
+ "bAutoWidth": false,
+ "oLanguage": {
+ "sSearch": "Filter results (i.e. '.txt'):"
+ }
+ });
+ } else {
+ \$('#resultsUrl').dataTable({
+ "bProcessing": true,
+ "aoColumns": [{"sType":"html"},{"sType":"date"},{"sType":"date"},null,null,null],
+ "aaSorting": [ [0,'asc'] ],
+ "bPaginate": true,
+ "bInfo": true,
+ "sPaginationType": "full_numbers",
+ "bFilter": true,
+ "bStateSave": true,
+ "bAutoWidth": false,
+ "oLanguage": {
+ "sSearch": "Filter results (i.e. '.txt'):"
+ },
+ "iDisplayLength": 50
+ });
+ }
+ });
+$(window).load(function(){
-<hr></hr>
+});
+</script>
+ <div id="positionHome">
+ <section>
+ <div id="logoHome">
+ <h1><span>Internet Archive's Wayback Machine</span></h1>
+ </div>
+ </section>
+ <section>
+ <div id="searchHome">
+ <form name="form1" method="get" action="<%= queryPrefix %>query">
+ <input type="hidden" name="<%= WaybackRequest.REQUEST_TYPE %>" value="<%= WaybackRequest.REQUEST_CAPTURE_QUERY %>">
+ <input type="text" name="<%= WaybackRequest.REQUEST_URL %>" value="http://" size="40">
+ <button type="submit" name="Submit">Go Wayback!</button>
+ </form>
+ <div id="searchAdvHome">
+ <a href="[ADVANCED SEARCH]">Advanced Search</a>
+ </div>
+ </div>
+ </section>
+ </div>
+ <div id="positionTable">
+
+ <h2 class="green"><%= fmt.format("PathPrefixQuery.showingResults",totalCaptures) %></h2>
+
+ <table id="resultsUrl">
+ <thead>
+ <tr>
+ <th class="url">URL<span></span></th>
+ <th>From<span></span></th>
+ <th>To<span></span></th>
+ <th>Captures<span></span></th>
+ <th>Duplicates<span></span></th>
+ <th>Uniques<span></span></th>
+ </tr>
+ </thead>
+ <tbody>
<%
Iterator<UrlSearchResult> itr = uResults.iterator();
while(itr.hasNext()) {
@@ -45,6 +131,7 @@
String lastDateTSss = result.getLastCaptureTimestamp();
long numCaptures = result.getNumCaptures();
long numVersions = result.getNumVersions();
+ long numDupes = result.getNumCaptures() - result.getNumVersions();
Date firstDate = result.getFirstCaptureDate();
Date lastDate = result.getLastCaptureDate();
@@ -53,9 +140,17 @@
String ts = result.getFirstCaptureTimestamp();
String anchor = uriConverter.makeReplayURI(ts,originalUrl);
%>
- <a onclick="SetAnchorDate('<%= ts %>');" href="<%= anchor %>">
- <%= urlKey %>
- </a>
+ <tr>
+ <td class="url">
+ <a onclick="SetAnchorDate('<%= ts %>');" href="<%= anchor %>"><%= urlKey %></a>
+ </td>
+ <td class="dateFrom"><%= fmt.format("PathPrefixQuery.captureDate",firstDate) %></td>
+ <td class="dateTo"><%= fmt.format("PathPrefixQuery.captureDate",lastDate) %></td>
+ <td class="captures"><%= numCaptures %></td>
+ <td class="dupes"><%= numDupes %></td>
+ <td class="uniques"><%= numVersions %></td>
+ </tr>
+ <!--
<span class="mainSearchText">
<%= fmt.format("PathPrefixQuery.versionCount",numVersions) %>
</span>
@@ -63,11 +158,23 @@
<span class="mainSearchText">
<%= fmt.format("PathPrefixQuery.singleCaptureDate",firstDate) %>
</span>
+ -->
<%
} else {
String anchor = results.makeCaptureQueryUrl(originalUrl);
%>
+ <tr>
+ <td class="url">
+ <a href="<%= anchor %>"><%= urlKey %></a>
+ </td>
+ <td class="dateFrom"><%= fmt.format("PathPrefixQuery.captureDate",firstDate) %></td>
+ <td class="dateTo"><%= fmt.format("PathPrefixQuery.captureDate",lastDate) %></td>
+ <td class="captures"><%= numCaptures %></td>
+ <td class="dupes"><%= numDupes %></td>
+ <td class="uniques"><%= numVersions %></td>
+ </tr>
+ <!--
<a href="<%= anchor %>">
<%= urlKey %>
</a>
@@ -78,11 +185,10 @@
<span class="mainSearchText">
<%= fmt.format("PathPrefixQuery.multiCaptureDate",numCaptures,firstDate,lastDate) %>
</span>
+ -->
<%
}
%>
- <br/>
- <br/>
<%
}
@@ -90,12 +196,11 @@
int curPage = uResults.getCurPageNum();
if(curPage > uResults.getNumPages()) {
%>
- <hr></hr>
<a href="<%= results.urlForPage(1) %>">First results</a>
<%
} else if(uResults.getNumPages() > 1) {
%>
- <hr></hr>
+
<%
for(int i = 1; i <= uResults.getNumPages(); i++) {
if(i == curPage) {
@@ -109,4 +214,9 @@
}
}
}
-%>
\ No newline at end of file
+%>
+ </tbody>
+ </table>
+
+
+<jsp:include page="/WEB-INF/global-template/UI-footer.jsp" flush="true" />
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
