Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access: [2391] trunk/archive-access/projects/wayback/ wayback-webapp/src/main/webapp/jsp
|
From: <bra...@us...> - 2008-07-02 00:31:36
|
Revision: 2391
http://archive-access.svn.sourceforge.net/archive-access/?rev=2391&view=rev
Author: bradtofel
Date: 2008-07-01 17:31:45 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
REMOVED: replaced with /query/(HTML|XML)(Url|Capture)Results.jsp
Removed Paths:
-------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLResults.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLResults.jsp
Deleted: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLResults.jsp 2008-07-02 00:30:47 UTC (rev 2390)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLResults.jsp 2008-07-02 00:31:45 UTC (rev 2391)
@@ -1,194 +0,0 @@
-<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.util.Date" %>
-<%@ page import="org.archive.wayback.WaybackConstants" %>
-<%@ page import="org.archive.wayback.core.SearchResult" %>
-<%@ page import="org.archive.wayback.core.Timestamp" %>
-<%@ page import="org.archive.wayback.core.UIResults" %>
-<%@ page import="org.archive.wayback.resourceindex.filters.CaptureToUrlResultFilter" %>
-
-<%@ page import="org.archive.wayback.query.UIQueryResults" %>
-<%@ page import="org.archive.wayback.util.StringFormatter" %>
-<jsp:include page="/template/UI-header.jsp" flush="true" />
-<%
-
-UIQueryResults results = (UIQueryResults) UIResults.getFromRequest(request);
-StringFormatter fmt = results.getFormatter();
-
-String searchString = results.getSearchUrl();
-
-
-if(results.isCaptureResults()) {
-
- int resultCount = results.getResultsReturned();
-
- Timestamp searchStartTs = results.getStartTimestamp();
- Timestamp searchEndTs = results.getEndTimestamp();
- Date searchStartDate = searchStartTs.getDate();
- Date searchEndDate = searchEndTs.getDate();
-
- Iterator itr = results.resultsIterator();
- %>
- <%= fmt.format("PathQuery.resultsSummary",resultCount,searchString) %>
- <br></br>
- <%= fmt.format("PathQuery.resultRange",searchStartDate,searchEndDate) %>
- <hr></hr>
- <%
- boolean first = false;
- String lastMD5 = null;
- while(itr.hasNext()) {
- SearchResult result = (SearchResult) itr.next();
-
- String url = result.get(WaybackConstants.RESULT_URL);
-
- String prettyDate = result.get(WaybackConstants.RESULT_CAPTURE_DATE);
- String origHost = result.get(WaybackConstants.RESULT_ORIG_HOST);
- String MD5 = result.get(WaybackConstants.RESULT_MD5_DIGEST);
- String redirectFlag = (0 == result.get(
- WaybackConstants.RESULT_REDIRECT_URL).compareTo("-"))
- ? "" : fmt.format("PathQuery.redirectIndicator");
- String httpResponse = result.get(WaybackConstants.RESULT_HTTP_CODE);
- String mimeType = result.get(WaybackConstants.RESULT_MIME_TYPE);
-
- String arcFile = result.get(WaybackConstants.RESULT_ARC_FILE);
- String arcOffset = result.get(WaybackConstants.RESULT_OFFSET);
-
- String replayUrl = results.resultToReplayUrl(result);
-
- boolean updated = false;
- if(lastMD5 == null) {
- lastMD5 = MD5;
- updated = true;
- } else if(0 != lastMD5.compareTo(MD5)) {
- updated = true;
- lastMD5 = MD5;
- }
- if(updated) {
- %>
- <a href="<%= replayUrl %>"><%= prettyDate %></a>
- <span style="color:black;"><%= origHost %></span>
- <span style="color:gray;"><%= httpResponse %></span>
- <span style="color:brown;"><%= mimeType %></span>
- <!--
- <span style="color:red;"><%= arcFile %></span>
- <span style="color:red;"><%= arcOffset %></span>
- -->
- <%= redirectFlag %>
- <%= fmt.format("PathQuery.newVersionIndicator") %>
-
- <br/>
- <%
- } else {
- %>
- <a href="<%= replayUrl %>"><%= prettyDate %></a>
- <span style="color:green;"><%= origHost %></span>
- <!--
- <span style="color:red;"><%= arcFile %></span>
- <span style="color:red;"><%= arcOffset %></span>
- -->
- <br/>
- <%
- }
- }
-
-} else if(results.isUrlResults()) {
-
-
-
- Date searchStartDate = results.getStartTimestamp().getDate();
- Date searchEndDate = results.getEndTimestamp().getDate();
-
-// PathQuerySearchResultPartitioner partitioner =
-// new PathQuerySearchResultPartitioner(results.getResults(),
-// results.getURIConverter());
-
- int firstResult = results.getFirstResult();
- int lastResult = results.getLastResult();
- int resultCount = results.getResultsMatching();
-
- int totalCaptures = results.getResultsMatching();
-
- %>
- <%= fmt.format("PathPrefixQuery.showingResults",firstResult,lastResult,
- resultCount,searchString) %>
- <br/>
-
- <hr></hr>
- <%
- Iterator itr = results.resultsIterator();
- while(itr.hasNext()) {
- SearchResult result = (SearchResult) itr.next();
-
- String url = result.get(CaptureToUrlResultFilter.RESULT_ORIGINAL_URL);
- String urlKey = result.get(CaptureToUrlResultFilter.RESULT_URL);
- String firstDateTS = result.get(CaptureToUrlResultFilter.RESULT_FIRST_CAPTURE);
- String lastDateTS = result.get(CaptureToUrlResultFilter.RESULT_LAST_CAPTURE);
- int numCaptures = Integer.valueOf(result.get(CaptureToUrlResultFilter.RESULT_NUM_CAPTURES));
- int numVersions = Integer.valueOf(result.get(CaptureToUrlResultFilter.RESULT_NUM_VERSIONS));
-
- Date firstDate = results.timestampToDate(firstDateTS);
- Date lastDate = results.timestampToDate(lastDateTS);
-
- if(numCaptures == 1) {
- String anchor = results.makeReplayUrl(url,firstDateTS);
- %>
- <a href="<%= anchor %>">
- <%= url %>
- </a>
- <span class="mainSearchText">
- <%= fmt.format("PathPrefixQuery.versionCount",numVersions) %>
- </span>
- <br/>
- <span class="mainSearchText">
- <%= fmt.format("PathPrefixQuery.singleCaptureDate",firstDate) %>
- </span>
- <%
-
- } else {
- String anchor = results.makeCaptureQueryUrl(url);
- %>
- <a href="<%= anchor %>">
- <%= url %>
- </a>
- <span class="mainSearchText">
- <%= fmt.format("PathPrefixQuery.versionCount",numVersions) %>
- </span>
- <br/>
- <span class="mainSearchText">
- <%= fmt.format("PathPrefixQuery.multiCaptureDate",numCaptures,firstDate,lastDate) %>
- </span>
- <%
- }
- %>
- <br/>
- <br/>
- <%
- }
-}
-// show page indicators:
-int curPage = results.getCurPage();
-if(curPage > results.getNumPages()) {
- %>
- <hr></hr>
- <a href="<%= results.urlForPage(1) %>">First results</a>
- <%
-} else if(results.getNumPages() > 1) {
- %>
- <hr></hr>
- <%
- for(int i = 1; i <= results.getNumPages(); i++) {
- if(i == curPage) {
- %>
- <b><%= i %></b>
- <%
- } else {
- %>
- <a href="<%= results.urlForPage(i) %>"><%= i %></a>
- <%
- }
- }
-}
-%>
-
-<jsp:include page="/template/UI-footer.jsp" flush="true" />
Deleted: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLResults.jsp 2008-07-02 00:30:47 UTC (rev 2390)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLResults.jsp 2008-07-02 00:31:45 UTC (rev 2391)
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<%@ page language="java" pageEncoding="utf-8" contentType="text/xml;charset=utf-8"%>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.util.Properties" %>
-<%@ page import="java.util.Enumeration" %>
-<%@ page import="org.archive.wayback.WaybackConstants" %>
-<%@ page import="org.archive.wayback.core.SearchResults" %>
-<%@ page import="org.archive.wayback.core.SearchResult" %>
-<%@ page import="org.archive.wayback.core.Timestamp" %>
-<%@ page import="org.archive.wayback.core.UIResults" %>
-<%@ page import="org.archive.wayback.query.UIQueryResults" %>
-<%
-UIQueryResults uiResults = (UIQueryResults) UIResults.getFromRequest(request);
-SearchResults results = uiResults.getResults();
-Iterator itr = uiResults.resultsIterator();
-%>
-<wayback>
- <request>
-<%
- Properties p = results.getFilters();
- for (Enumeration e = p.keys(); e.hasMoreElements();) {
- String key = UIQueryResults.encodeXMLEntity((String) e.nextElement());
- String value = UIQueryResults.encodeXMLContent((String) p.get(key));
- %>
- <<%= key %>><%= value %></<%= key %>>
- <%
- }
- String type = WaybackConstants.RESULTS_TYPE_CAPTURE;
- if(uiResults.isUrlResults()) {
- type = WaybackConstants.RESULTS_TYPE_URL;
- }
-%>
- <<%= WaybackConstants.RESULTS_TYPE %>><%= type %></<%= WaybackConstants.RESULTS_TYPE %>>
- </request>
- <results>
-<%
- while(itr.hasNext()) {
- %>
- <result>
- <%
- SearchResult result = (SearchResult) itr.next();
- Properties p2 = result.getData();
- for (Enumeration e = p2.keys(); e.hasMoreElements();) {
- // TODO: encode!
- String key = UIQueryResults.encodeXMLEntity((String) e.nextElement());
- String value = UIQueryResults.encodeXMLContent((String) p2.get(key));
- %>
- <<%= key %>><%= value %></<%= key %>>
- <%
- }
- %>
- </result>
- <%
- }
-%>
- </results>
-</wayback>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
