Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access:[3121] trunk/archive-access/projects/wayback/ wayback-webapp/src/main/webapp/WEB-INF/query
|
From: <bra...@us...> - 2010-05-18 23:41:25
|
Revision: 3121
http://archive-access.svn.sourceforge.net/archive-access/?rev=3121&view=rev
Author: bradtofel
Date: 2010-05-18 23:41:18 +0000 (Tue, 18 May 2010)
Log Message:
-----------
now uses getQuery|Static|ReplayPrefix
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/CalendarResults.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLCaptureResults.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/OldCalendarResults.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/OpenSearchCaptureResults.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/OpenSearchUrlResults.jsp
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/CalendarResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/CalendarResults.jsp 2010-05-18 23:39:28 UTC (rev 3120)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/CalendarResults.jsp 2010-05-18 23:41:18 UTC (rev 3121)
@@ -25,6 +25,9 @@
String searchString = fmt.escapeHtml(wbRequest.getRequestUrl());
List<String> closeMatches = cResults.getCloseMatches();
+String staticPrefix = results.getStaticPrefix();
+String queryPrefix = results.getQueryPrefix();
+String replayPrefix = results.getReplayPrefix();
Date searchStartDate = wbRequest.getStartDate();
Date searchEndDate = wbRequest.getEndDate();
@@ -174,8 +177,8 @@
<%
for(String closeMatch : closeMatches) {
tmp.setRequestUrl(closeMatch);
- String link = fmt.escapeHtml(tmp.getContextPrefix() + "query?" +
- tmp.getQueryArguments());
+ String link = fmt.escapeHtml(tmp.getAccessPoint().getQueryPrefix() +
+ "query?" + tmp.getQueryArguments());
closeMatch = fmt.escapeHtml(closeMatch);
%>
<a href="<%= link %>"><%= closeMatch %></a><br>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLCaptureResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLCaptureResults.jsp 2010-05-18 23:39:28 UTC (rev 3120)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLCaptureResults.jsp 2010-05-18 23:41:18 UTC (rev 3121)
@@ -33,11 +33,14 @@
<%
boolean first = false;
String lastMD5 = null;
+ String lastUrl = null;
while(itr.hasNext()) {
CaptureSearchResult result = (CaptureSearchResult) itr.next();
String url = result.getUrlKey();
-
+ if(url != lastUrl) {
+ lastMD5 = null;
+ }
String prettyDate = result.getCaptureTimestamp();
String origHost = result.getOriginalHost();
String MD5 = result.getDigest();
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/OldCalendarResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/OldCalendarResults.jsp 2010-05-18 23:39:28 UTC (rev 3120)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/OldCalendarResults.jsp 2010-05-18 23:41:18 UTC (rev 3121)
@@ -164,8 +164,8 @@
<%
for(String closeMatch : closeMatches) {
tmp.setRequestUrl(closeMatch);
- String link = tmp.getContextPrefix() + "query?" +
- tmp.getQueryArguments();
+ String link = fmt.escapeHtml(tmp.getContextPrefix() + "query?" +
+ tmp.getQueryArguments());
%>
<a href="<%= link %>"><%= closeMatch %></a><br>
<%
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/OpenSearchCaptureResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/OpenSearchCaptureResults.jsp 2010-05-18 23:39:28 UTC (rev 3120)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/OpenSearchCaptureResults.jsp 2010-05-18 23:41:18 UTC (rev 3121)
@@ -29,7 +29,11 @@
StringFormatter fmt = wbRequest.getFormatter();
CaptureSearchResults results = uiResults.getCaptureResults();
Iterator<CaptureSearchResult> itr = results.iterator();
-String contextRoot = wbRequest.getContextPrefix();
+
+String staticPrefix = uiResults.getStaticPrefix();
+String queryPrefix = uiResults.getQueryPrefix();
+String replayPrefix = uiResults.getReplayPrefix();
+
String searchString = wbRequest.getRequestUrl();
long firstResult = results.getFirstReturned();
long shownResultCount = results.getReturnedCount();
@@ -47,12 +51,12 @@
xmlns:atom="http://www.w3.org/2005/Atom">
<channel>
<title>Wayback OpenSearch Results</title>
- <link><%= contextRoot %>></link>
+ <link><%= queryPrefix %>></link>
<description><%= fmt.format("PathQueryClassic.searchedFor",searchString) %></description>
<opensearch:totalResults><%= resultCount %></opensearch:totalResults>
<opensearch:startIndex><%= firstResult %></opensearch:startIndex>
<opensearch:itemsPerPage><%= shownResultCount %></opensearch:itemsPerPage>
- <atom:link rel="search" type="application/opensearchdescription+xml" href="<%= contextRoot %>/opensearchdescription.xml"/>
+ <atom:link rel="search" type="application/opensearchdescription+xml" href="<%= staticPrefix %>/opensearchdescription.xml"/>
<opensearch:Query role="request" searchTerms="<%= UIResults.encodeXMLContent(searchTerms) %>" startPage="<%= wbRequest.getPageNum() %>" />
<%
while(itr.hasNext()) {
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/OpenSearchUrlResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/OpenSearchUrlResults.jsp 2010-05-18 23:39:28 UTC (rev 3120)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/OpenSearchUrlResults.jsp 2010-05-18 23:41:18 UTC (rev 3121)
@@ -31,7 +31,11 @@
StringFormatter fmt = wbRequest.getFormatter();
UrlSearchResults results = uiResults.getUrlResults();
Iterator<UrlSearchResult> itr = results.iterator();
-String contextRoot = wbRequest.getContextPrefix();
+
+String staticPrefix = uiResults.getStaticPrefix();
+String queryPrefix = uiResults.getQueryPrefix();
+String replayPrefix = uiResults.getReplayPrefix();
+
String searchString = wbRequest.getRequestUrl();
long firstResult = results.getFirstReturned();
long shownResultCount = results.getReturnedCount();
@@ -49,12 +53,12 @@
xmlns:atom="http://www.w3.org/2005/Atom">
<channel>
<title>Wayback OpenSearch Results</title>
- <link><%= contextRoot %>></link>
+ <link><%= queryPrefix %>></link>
<description><%= fmt.format("PathQueryClassic.searchedFor",searchString) %></description>
<opensearch:totalResults><%= resultCount %></opensearch:totalResults>
<opensearch:startIndex><%= firstResult %></opensearch:startIndex>
<opensearch:itemsPerPage><%= shownResultCount %></opensearch:itemsPerPage>
- <atom:link rel="search" type="application/opensearchdescription+xml" href="<%= contextRoot %>/opensearchdescription.xml"/>
+ <atom:link rel="search" type="application/opensearchdescription+xml" href="<%= staticPrefix %>/opensearchdescription.xml"/>
<opensearch:Query role="request" searchTerms="<%= UIResults.encodeXMLContent(searchTerms) %>" startPage="<%= wbRequest.getPageNum() %>" />
<%
while(itr.hasNext()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
