Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access:[3363] trunk/archive-access/projects/wayback/ wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp
|
From: <bra...@us...> - 2010-12-31 01:47:05
|
Revision: 3363
http://archive-access.svn.sourceforge.net/archive-access/?rev=3363&view=rev
Author: bradtofel
Date: 2010-12-31 01:46:59 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
reverting back to quite older version.. which isn't broken..
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-12-31 01:13:18 UTC (rev 3362)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp 2010-12-31 01:46:59 UTC (rev 3363)
@@ -9,9 +9,7 @@
%><%@ 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/template/UI-header.jsp" flush="true" />
-<%
+%><%
UIResults results = UIResults.extractUrlQuery(request);
WaybackRequest wbRequest = results.getWbRequest();
UrlSearchResults uResults = results.getUrlResults();
@@ -19,10 +17,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();
@@ -32,89 +30,11 @@
long totalCaptures = uResults.getMatchingCount();
%>
-<script type="text/javascript" src="<%= staticPrefix %>js/jquery-1.4.2.min.js"></script>
-<script type="text/javascript" src="<%= staticPrefix %>js/jquery.dataTables.min.js" charset="utf-8"></script>
-<script type="text/javascript">
-$().ready(function(){
- $('#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
- });
- }
- });
-</script>
- <div id="positionHome">
- <section>
- <div id="logoHome">
- <a href="/index.jsp"><h1><span>Internet Archive's Wayback Machine</span></h1></a>
- </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">
+<%= fmt.format("PathPrefixQuery.showingResults",firstResult + 1,lastResult,
+ totalCaptures,searchString) %>
+<br/>
- <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>
+<hr></hr>
<%
Iterator<UrlSearchResult> itr = uResults.iterator();
while(itr.hasNext()) {
@@ -126,26 +46,17 @@
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();
if(numCaptures == 1) {
- String ts = result.getFirstCaptureTimestamp();
- String anchor = uriConverter.makeReplayURI(ts,originalUrl);
+ String ts = result.getFirstCaptureTimestamp();
+ String anchor = uriConverter.makeReplayURI(ts,originalUrl);
%>
- <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>
- <!--
+ <a onclick="SetAnchorDate('<%= ts %>');" href="<%= anchor %>">
+ <%= urlKey %>
+ </a>
<span class="mainSearchText">
<%= fmt.format("PathPrefixQuery.versionCount",numVersions) %>
</span>
@@ -153,23 +64,11 @@
<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>
@@ -180,10 +79,11 @@
<span class="mainSearchText">
<%= fmt.format("PathPrefixQuery.multiCaptureDate",numCaptures,firstDate,lastDate) %>
</span>
- -->
<%
}
%>
+ <br/>
+ <br/>
<%
}
@@ -191,11 +91,12 @@
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) {
@@ -209,9 +110,4 @@
}
}
}
-%>
- </tbody>
- </table>
-
-
-<jsp:include page="/WEB-INF/template/UI-footer.jsp" flush="true" />
\ No newline at end of file
+%>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
