Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access: [2389] trunk/archive-access/projects/wayback/ wayback-webapp/src/main/webapp/query
|
From: <bra...@us...> - 2008-07-02 00:25:42
|
Revision: 2389
http://archive-access.svn.sourceforge.net/archive-access/?rev=2389&view=rev
Author: bradtofel
Date: 2008-07-01 17:25:51 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
MOVE: moved all query related .jsps to /query/.
separated URL and Capture query renderers into seprate .jsp files
now use UICaptureQueryResults and UIUrlQueryResults for context.
Added Paths:
-----------
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
Added: 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 (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/HTMLCaptureResults.jsp 2008-07-02 00:25:51 UTC (rev 2389)
@@ -0,0 +1,114 @@
+<%@ 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.CaptureSearchResult" %>
+<%@ page import="org.archive.wayback.core.Timestamp" %>
+<%@ page import="org.archive.wayback.core.UIResults" %>
+<%@ page import="org.archive.wayback.query.UICaptureQueryResults" %>
+<%@ 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();
+
+String searchString = results.getSearchUrl();
+
+ int resultCount = results.getResultsReturned();
+
+ Timestamp searchStartTs = results.getStartTimestamp();
+ Timestamp searchEndTs = results.getEndTimestamp();
+ Date searchStartDate = searchStartTs.getDate();
+ Date searchEndDate = searchEndTs.getDate();
+
+ Iterator<CaptureSearchResult> 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()) {
+ CaptureSearchResult result = (CaptureSearchResult) itr.next();
+
+ String url = result.getUrlKey();
+
+ String prettyDate = result.getCaptureTimestamp();
+ String origHost = result.getOriginalHost();
+ String MD5 = result.getDigest();
+ String redirectFlag = (0 == result.getRedirectUrl().compareTo("-"))
+ ? "" : fmt.format("PathQuery.redirectIndicator");
+ String httpResponse = result.getHttpCode();
+ String mimeType = result.getMimeType();
+
+ String arcFile = result.getFile();
+ String arcOffset = String.valueOf(result.getOffset());
+
+ 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/>
+ <%
+ }
+ }
+
+// 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" />
Added: 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 (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/HTMLUrlResults.jsp 2008-07-02 00:25:51 UTC (rev 2389)
@@ -0,0 +1,116 @@
+<%@ 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.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.util.StringFormatter" %>
+<jsp:include page="/template/UI-header.jsp" flush="true" />
+<%
+
+UIUrlQueryResults results = (UIUrlQueryResults) UIResults.getFromRequest(request);
+StringFormatter fmt = results.getFormatter();
+
+String searchString = results.getSearchUrl();
+
+
+
+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<UrlSearchResult> itr = results.resultsIterator();
+while(itr.hasNext()) {
+ UrlSearchResult result = itr.next();
+
+ String urlKey = result.getUrlKey();
+ String originalUrl = result.getOriginalUrl();
+ String firstDateTS = result.getFirstCaptureTimestamp();
+ String lastDateTS = result.getLastCaptureTimestamp();
+ long numCaptures = result.getNumCaptures();
+ long numVersions = result.getNumVersions();
+
+ Date firstDate = results.timestampToDate(firstDateTS);
+ Date lastDate = results.timestampToDate(lastDateTS);
+
+ if(numCaptures == 1) {
+ String anchor = results.makeReplayUrl(originalUrl,firstDateTS);
+ %>
+ <a href="<%= anchor %>">
+ <%= urlKey %>
+ </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(originalUrl);
+ %>
+ <a href="<%= anchor %>">
+ <%= urlKey %>
+ </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" />
Added: 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 (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/XMLCaptureResults.jsp 2008-07-02 00:25:51 UTC (rev 2389)
@@ -0,0 +1,59 @@
+<?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.Map" %>
+<%@ page import="java.util.Enumeration" %>
+<%@ 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.query.UICaptureQueryResults" %>
+<%
+UICaptureQueryResults uiResults = (UICaptureQueryResults) UIResults.getFromRequest(request);
+
+CaptureSearchResults results = uiResults.getResults();
+Iterator<CaptureSearchResult> itr = uiResults.resultsIterator();
+%>
+<wayback>
+ <request>
+<%
+ Map<String,String> p = results.getFilters();
+ Iterator<String> kitr = p.keySet().iterator();
+ while(kitr.hasNext()) {
+ String key = kitr.next();
+ String oKey = UIResults.encodeXMLEntity(key);
+ String oValue = UIResults.encodeXMLContent(p.get(key));
+ %>
+ <<%= oKey %>><%= oValue %></<%= oKey %>>
+ <%
+ }
+%>
+ <<%= WaybackConstants.RESULTS_TYPE %>><%= WaybackConstants.RESULTS_TYPE_CAPTURE %></<%= WaybackConstants.RESULTS_TYPE %>>
+ </request>
+ <results>
+<%
+ while(itr.hasNext()) {
+ %>
+ <result>
+ <%
+ CaptureSearchResult result = itr.next();
+ Map<String,String> p2 = result.toCanonicalStringMap();
+ kitr = p2.keySet().iterator();
+
+ while(kitr.hasNext()) {
+ String key = kitr.next();
+ String oKey = UIResults.encodeXMLEntity(key);
+ String oValue = UIResults.encodeXMLContent(p2.get(key));
+ %>
+ <<%= oKey %>><%= oValue %></<%= oKey %>>
+ <%
+ }
+ %>
+ </result>
+ <%
+ }
+%>
+ </results>
+</wayback>
Added: 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 (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/query/XMLUrlResults.jsp 2008-07-02 00:25:51 UTC (rev 2389)
@@ -0,0 +1,59 @@
+<?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.Map" %>
+<%@ page import="java.util.Enumeration" %>
+<%@ page import="org.archive.wayback.WaybackConstants" %>
+<%@ page import="org.archive.wayback.core.UrlSearchResults" %>
+<%@ page import="org.archive.wayback.core.UrlSearchResult" %>
+<%@ page import="org.archive.wayback.core.Timestamp" %>
+<%@ page import="org.archive.wayback.core.UIResults" %>
+<%@ page import="org.archive.wayback.query.UIUrlQueryResults" %>
+<%
+UIUrlQueryResults uiResults = (UIUrlQueryResults) UIResults.getFromRequest(request);
+
+UrlSearchResults results = uiResults.getResults();
+Iterator<UrlSearchResult> itr = uiResults.resultsIterator();
+%>
+<wayback>
+ <request>
+<%
+ Map<String,String> p = results.getFilters();
+ Iterator<String> kitr = p.keySet().iterator();
+ while(kitr.hasNext()) {
+ String key = kitr.next();
+ String oKey = UIResults.encodeXMLEntity(key);
+ String oValue = UIResults.encodeXMLContent(p.get(key));
+ %>
+ <<%= oKey %>><%= oValue %></<%= oKey %>>
+ <%
+ }
+%>
+ <<%= WaybackConstants.RESULTS_TYPE %>><%= WaybackConstants.RESULTS_TYPE_URL %></<%= WaybackConstants.RESULTS_TYPE %>>
+ </request>
+ <results>
+<%
+ while(itr.hasNext()) {
+ %>
+ <result>
+ <%
+ UrlSearchResult result = itr.next();
+ Map<String,String> p2 = result.toCanonicalStringMap();
+ kitr = p2.keySet().iterator();
+
+ while(kitr.hasNext()) {
+ String key = kitr.next();
+ String oKey = UIResults.encodeXMLEntity(key);
+ String oValue = UIResults.encodeXMLContent(p2.get(key));
+ %>
+ <<%= oKey %>><%= oValue %></<%= oKey %>>
+ <%
+ }
+ %>
+ </result>
+ <%
+ }
+%>
+ </results>
+</wayback>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
