Menu
▾
▴
archive-access-cvs
|
From: <bra...@us...> - 2010-05-18 23:38:46
|
Revision: 3119
http://archive-access.svn.sourceforge.net/archive-access/?rev=3119&view=rev
Author: bradtofel
Date: 2010-05-18 23:38:40 +0000 (Tue, 18 May 2010)
Log Message:
-----------
INITIAL REV: renders a redirect resource with a page indicating the redirect and using javascript to automate the redirect after a few seconds
Added Paths:
-----------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp
Added: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp 2010-05-18 23:38:40 UTC (rev 3119)
@@ -0,0 +1,56 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
+<%@ page import="java.util.Date" %>
+<%@ page import="java.lang.StringBuffer" %>
+<%@ page import="org.archive.wayback.archivalurl.ArchivalUrlDateRedirectReplayRenderer" %>
+<%@ page import="org.archive.wayback.ResultURIConverter" %>
+<%@ page import="org.archive.wayback.core.UIResults" %>
+<%@ page import="org.archive.wayback.core.WaybackRequest" %>
+<%@ page import="org.archive.wayback.core.CaptureSearchResult" %>
+<%@ page import="org.archive.wayback.util.StringFormatter" %>
+<%
+UIResults results = UIResults.extractReplay(request);
+
+WaybackRequest wbr = results.getWbRequest();
+StringFormatter fmt = wbr.getFormatter();
+CaptureSearchResult cResult = results.getResult();
+ResultURIConverter uric = results.getURIConverter();
+
+String sourceUrl = cResult.getOriginalUrl();
+String targetUrl = cResult.getRedirectUrl();
+String captureTS = cResult.getCaptureTimestamp();
+Date captureDate = cResult.getCaptureDate();
+
+String dateSpec =
+ ArchivalUrlDateRedirectReplayRenderer.makeFlagDateSpec(captureTS, wbr);
+
+String targetReplayUrl = uric.makeReplayURI(dateSpec,targetUrl);
+
+String safeSource = fmt.escapeHtml(sourceUrl);
+String safeTarget = fmt.escapeHtml(targetUrl);
+String safeTargetJS = fmt.escapeJavaScript(targetUrl);
+String safeTargetReplayUrl = fmt.escapeHtml(targetReplayUrl);
+String safeTargetReplayUrlJS = fmt.escapeJavaScript(targetReplayUrl);
+
+String prettyDate = fmt.format("MetaReplay.captureDateDisplay",captureDate);
+int secs = 5;
+
+%>
+<jsp:include page="/WEB-INF/template/UI-header.jsp" flush="true" />
+ <script type="text/javascript">
+ function go() {
+ document.location.href = "<%= safeTargetReplayUrlJS %>";
+ }
+ window.setTimeout("go()",<%= secs * 1000 %>);
+ </script>
+ <h2>Redirecting...</h2>
+ <p>The URL you requested:</p>
+ <p><%= safeSource %></p>
+ <p>redirected to the URL:</p>
+ <p><%= safeTarget %></p>
+ <p>
+ when it was crawled at <%= prettyDate %>. You will be redirected
+ to that target in <%= secs %> seconds.
+ Click <a href="<%= safeTargetReplayUrl %>">here</a> to go now.
+ </p>
+<jsp:include page="/WEB-INF/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.
|
|
From: <bra...@us...> - 2010-06-05 01:26:12
|
Revision: 3154
http://archive-access.svn.sourceforge.net/archive-access/?rev=3154&view=rev
Author: bradtofel
Date: 2010-06-05 01:26:05 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
text change. needs to be externalized...
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp 2010-06-05 01:25:12 UTC (rev 3153)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp 2010-06-05 01:26:05 UTC (rev 3154)
@@ -41,7 +41,7 @@
}
window.setTimeout("go()",<%= secs * 1000 %>);
</script>
- <h2>Redirecting...</h2>
+ <h2>Following redirect...</h2>
<p>The URL you requested:</p>
<p><%= safeSource %></p>
<p>redirected to the URL:</p>
@@ -51,4 +51,3 @@
to that target in <%= secs %> seconds.
Click <a href="<%= safeTargetReplayUrl %>">here</a> to go now.
</p>
-
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2010-07-28 00:23:32
|
Revision: 3195
http://archive-access.svn.sourceforge.net/archive-access/?rev=3195&view=rev
Author: bradtofel
Date: 2010-07-28 00:23:25 +0000 (Wed, 28 Jul 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp 2010-07-28 00:21:08 UTC (rev 3194)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp 2010-07-28 00:23:25 UTC (rev 3195)
@@ -40,7 +40,7 @@
<div id="positionHome">
<section>
<div id="logoHome">
- <h1><span>Internet Archive's Wayback Machine</span></h1>
+ <a href="/index.jsp"><h1><span>Internet Archive's Wayback Machine</span></h1></a>
</div>
</section>
<section>
@@ -52,10 +52,10 @@
window.setTimeout("go()",<%= secs * 1000 %>);
</script>
<p class="code">Loading...</p>
- <p class="code shift"><%= safeSource %> | <%= prettyDate %></p>
+ <p class="code shift target"><%= safeSource %> | <%= prettyDate %></p>
<p class="code shift red">Got an HTTP 302 response at crawl time</p>
<p class="code">Redirecting to...</p>
- <p><%= safeTarget %></p>
+ <p class="code shift target"><%= safeTarget %></p>
<p class="impatient"><a href="<%= safeTargetReplayUrl %>">Impatient?</a></p>
</div>
</section>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-02-06 15:00:46
|
Revision: 3414
http://archive-access.svn.sourceforge.net/archive-access/?rev=3414&view=rev
Author: bradtofel
Date: 2011-02-06 15:00:40 +0000 (Sun, 06 Feb 2011)
Log Message:
-----------
BUGFIX (unreported) now attempts to use Location HTTP header if CDX has empty ("-") redirect URL
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp 2011-02-06 14:59:39 UTC (rev 3413)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp 2011-02-06 15:00:40 UTC (rev 3414)
@@ -1,5 +1,7 @@
<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"
%><%@ page import="java.util.Date"
+%><%@ page import="java.util.Map"
+%><%@ page import="java.util.Iterator"
%><%@ page import="java.lang.StringBuffer"
%><%@ page import="org.archive.wayback.archivalurl.ArchivalUrlDateRedirectReplayRenderer"
%><%@ page import="org.archive.wayback.ResultURIConverter"
@@ -7,6 +9,7 @@
%><%@ page import="org.archive.wayback.core.WaybackRequest"
%><%@ page import="org.archive.wayback.core.CaptureSearchResult"
%><%@ page import="org.archive.wayback.util.StringFormatter"
+%><%@ page import="org.archive.wayback.util.url.UrlOperations"
%><%
UIResults results = UIResults.extractReplay(request);
@@ -19,7 +22,21 @@
String targetUrl = cResult.getRedirectUrl();
String captureTS = cResult.getCaptureTimestamp();
Date captureDate = cResult.getCaptureDate();
-
+if(targetUrl.equals("-")) {
+ Map<String,String> headers = results.getResource().getHttpHeaders();
+ Iterator<String> headerNameItr = headers.keySet().iterator();
+ while(headerNameItr.hasNext()) {
+ String name = headerNameItr.next();
+ if(name.toUpperCase().equals("LOCATION")) {
+ targetUrl = headers.get(name);
+ // by the spec, these should be absolute already, but just in case:
+ targetUrl = UrlOperations.resolveUrl(sourceUrl, targetUrl);
+
+
+ }
+ }
+}
+// TODO: Handle replay if we still don't have a redirect..
String dateSpec =
ArchivalUrlDateRedirectReplayRenderer.makeFlagDateSpec(captureTS, wbr);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-05-25 01:47:40
|
Revision: 3456
http://archive-access.svn.sourceforge.net/archive-access/?rev=3456&view=rev
Author: bradtofel
Date: 2011-05-25 01:47:34 +0000 (Wed, 25 May 2011)
Log Message:
-----------
REFACTOR: moved flag assignment and parsing code into ArchivalUrl
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp 2011-05-25 01:46:53 UTC (rev 3455)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/UrlRedirectNotice.jsp 2011-05-25 01:47:34 UTC (rev 3456)
@@ -5,6 +5,7 @@
%><%@ page import="java.lang.StringBuffer"
%><%@ page import="org.archive.wayback.archivalurl.ArchivalUrlDateRedirectReplayRenderer"
%><%@ page import="org.archive.wayback.ResultURIConverter"
+%><%@ page import="org.archive.wayback.archivalurl.ArchivalUrl"
%><%@ page import="org.archive.wayback.core.UIResults"
%><%@ page import="org.archive.wayback.core.WaybackRequest"
%><%@ page import="org.archive.wayback.core.CaptureSearchResult"
@@ -37,8 +38,8 @@
}
}
// TODO: Handle replay if we still don't have a redirect..
-String dateSpec =
- ArchivalUrlDateRedirectReplayRenderer.makeFlagDateSpec(captureTS, wbr);
+ArchivalUrl aUrl = new ArchivalUrl(wbr);
+String dateSpec = aUrl.getDateSpec(captureTS);
String targetReplayUrl = uric.makeReplayURI(dateSpec,targetUrl);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X