Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access:[3332] trunk/archive-access/projects/wayback
|
From: <bra...@us...> - 2010-11-11 05:49:13
|
Revision: 3332
http://archive-access.svn.sourceforge.net/archive-access/?rev=3332&view=rev
Author: bradtofel
Date: 2010-11-11 05:49:07 +0000 (Thu, 11 Nov 2010)
Log Message:
-----------
TWEAK: changed rel Link headers per fixes for RFC, removed TCN headers
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/MementoReplayRendererDecorator.java
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/Memento.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/ORE.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/MementoValidity.jsp
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/MementoReplayRendererDecorator.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/MementoReplayRendererDecorator.java 2010-11-11 05:47:25 UTC (rev 3331)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/MementoReplayRendererDecorator.java 2010-11-11 05:49:07 UTC (rev 3332)
@@ -87,7 +87,7 @@
String timemap = " , <"
+ apProps.getProperty("aggregationPrefix")
+ "timemap/link/" + u
- + ">;rel=\"timemap\"; type=\"text/csv\"";
+ + ">;rel=\"timemap\"; type=\"application/link-format\"";
String timegate = ",<" + uriPrefix + "timegate/" + u
+ ">;rel=\"timegate\"";
@@ -101,7 +101,7 @@
httpformatterl.format(result.getCaptureDate()));
String memento = ",<" + uriPrefix + formatterk.format(closestDate)
- + "/" + u + ">;rel=\"memento\";datetime=\""
+ + "/" + u + ">;rel=\"memento\"; datetime=\""
+ httpformatterl.format(closestDate) + "\"";
String mfl = null;
if ((closestDate.equals(f)) && closestDate.equals(l)) {
@@ -110,31 +110,31 @@
+ formatterk.format(f)
+ "/"
+ u
- + ">;rel=\"first-memento memento last-memento\"; datetime=\""
+ + ">;rel=\"first last memento\"; datetime=\""
+ httpformatterl.format(f) + "\"";
} else if (closestDate.equals(f)) {
mfl = ", <" + uriPrefix + formatterk.format(f) + "/" + u
- + ">;rel=\"first-memento memento\"; datetime=\""
+ + ">;rel=\"first memento\"; datetime=\""
+ httpformatterl.format(f) + "\"";
mfl = mfl + ", <" + uriPrefix + formatterk.format(l) + "/" + u
- + ">;rel=\"last-memento\"; datetime=\""
+ + ">;rel=\"last memento\"; datetime=\""
+ httpformatterl.format(l) + "\"";
} else if (closestDate.equals(l)) {
mfl = ", <" + uriPrefix + formatterk.format(l) + "/" + u
- + ">;rel=\"last-memento memento\"; datetime=\""
+ + ">;rel=\"last memento\"; datetime=\""
+ httpformatterl.format(l) + "\"";
mfl = mfl + ", <" + uriPrefix + formatterk.format(f) + "/" + u
- + ">;rel=\"first-memento\"; datetime=\""
+ + ">;rel=\"first memento\"; datetime=\""
+ httpformatterl.format(f) + "\"";
} else {
mfl = memento;
mfl = mfl + ", <" + uriPrefix + formatterk.format(l) + "/" + u
- + ">;rel=\"last-memento\"; datetime=\""
+ + ">;rel=\"last memento\"; datetime=\""
+ httpformatterl.format(l) + "\"";
mfl = mfl + ", <" + uriPrefix + formatterk.format(f) + "/" + u
- + ">;rel=\"first-memento\"; datetime=\""
+ + ">;rel=\"first memento\"; datetime=\""
+ httpformatterl.format(f) + "\"";
}
@@ -184,12 +184,12 @@
+ formatterk.format(closestleft.getCaptureDate())
+ "/"
+ u
- + ">;rel=\"prev-memento\"; datetime=\""
+ + ">;rel=\"prev memento\"; datetime=\""
+ httpformatterl.format(closestleft
.getCaptureDate()) + "\"");
} else {
- int m_index = sb.lastIndexOf("\"first-memento\"");
- sb.insert(m_index + 1, "prev-memento ");
+ int m_index = sb.lastIndexOf("\"first memento\"");
+ sb.insert(m_index + 1, "prev ");
}
}
@@ -200,12 +200,12 @@
+ formatterk.format(closestright.getCaptureDate())
+ "/"
+ u
- + ">;rel=\"next-memento\"; datetime=\""
+ + ">;rel=\"next memento\"; datetime=\""
+ httpformatterl.format(closestright
.getCaptureDate()) + "\"");
} else {
- int m_index = sb.lastIndexOf("\"last-memento\"");
- sb.insert(m_index + 1, "next-memento ");
+ int m_index = sb.lastIndexOf("\"last memento\"");
+ sb.insert(m_index + 1, "next ");
}
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/Memento.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/Memento.jsp 2010-11-11 05:47:25 UTC (rev 3331)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/Memento.jsp 2010-11-11 05:49:07 UTC (rev 3332)
@@ -51,7 +51,7 @@
String timemap = " , <"
+ results.getContextConfig("aggregationPrefix")
+ "timemap/link/" + u
- + ">;rel=\"timemap\"; type=\"text/csv\"";
+ + ">;rel=\"timemap\"; type=\"application/link-format\"";
String origlink = ", <" + u + ">;rel=\"original\"";
String uriPrefix = wbRequest.getAccessPoint().getReplayPrefix();
@@ -74,31 +74,31 @@
+ formatterk.format(f)
+ "/"
+ u
- + ">;rel=\"first-memento memento last-memento\"; datetime=\""
+ + ">;rel=\"first last memento\"; datetime=\""
+ httpformatterl.format(f) + "\"";
} else if (closestDate.equals(f)) {
mfl = ", <" + uriPrefix + formatterk.format(f) + "/" + u
- + ">;rel=\"first-memento memento\"; datetime=\""
+ + ">;rel=\"first memento\"; datetime=\""
+ httpformatterl.format(f) + "\"";
mfl = mfl + ", <" + uriPrefix + formatterk.format(l) + "/" + u
- + ">;rel=\"last-memento\"; datetime=\""
+ + ">;rel=\"last memento\"; datetime=\""
+ httpformatterl.format(l) + "\"";
} else if (closestDate.equals(l)) {
mfl = ", <" + uriPrefix + formatterk.format(l) + "/" + u
- + ">;rel=\"last-memento memento\"; datetime=\""
+ + ">;rel=\"last memento\"; datetime=\""
+ httpformatterl.format(l) + "\"";
mfl = mfl + ", <" + uriPrefix + formatterk.format(f) + "/" + u
- + ">;rel=\"first-memento\"; datetime=\""
+ + ">;rel=\"first memento\"; datetime=\""
+ httpformatterl.format(f) + "\"";
} else {
mfl = memento;
mfl = mfl + ", <" + uriPrefix + formatterk.format(l) + "/" + u
- + ">;rel=\"last-memento\"; datetime=\""
+ + ">;rel=\"last memento\"; datetime=\""
+ httpformatterl.format(l) + "\"";
mfl = mfl + ", <" + uriPrefix + formatterk.format(f) + "/" + u
- + ">;rel=\"first-memento\"; datetime=\""
+ + ">;rel=\"first memento\"; datetime=\""
+ httpformatterl.format(f) + "\"";
}
@@ -116,18 +116,18 @@
+ formatterk.format(f)
+ "/"
+ u
- + ">;rel=\"last-memento first-memento\"; datetime=\""
+ + ">;rel=\"last first memento\"; datetime=\""
+ httpformatterl.format(f) + "\"";
} else {
fl = ", <" + uriPrefix + formatterk.format(l) + "/" + u
- + ">;rel=\"last-memento\"; datetime=\""
+ + ">;rel=\"last memento\"; datetime=\""
+ httpformatterl.format(l) + "\"";
fl = fl + ", <" + uriPrefix + formatterk.format(f) + "/"
- + u + ">;rel=\"first-memento\"; datetime=\""
+ + u + ">;rel=\"first memento\"; datetime=\""
+ httpformatterl.format(f) + "\"";
}
- response.setHeader("TCN", "list");
+
response.setStatus(400);
response.setHeader("Link", "<" + agguri
+ ">;rel=\"timebundle\"" + origlink + fl + timemap);
@@ -203,12 +203,12 @@
+ formatterk.format(closestleft.getCaptureDate())
+ "/"
+ u
- + ">;rel=\"prev-memento\"; datetime=\""
+ + ">;rel=\"prev memento\"; datetime=\""
+ httpformatterl.format(closestleft
.getCaptureDate()) + "\"");
} else {
- int m_index = sb.lastIndexOf("\"first-memento\"");
- sb.insert(m_index + 1, "prev-memento ");
+ int m_index = sb.lastIndexOf("\"first memento\"");
+ sb.insert(m_index + 1, "prev ");
}
}
if (closestright != null) {
@@ -218,12 +218,12 @@
+ formatterk.format(closestright.getCaptureDate())
+ "/"
+ u
- + ">;rel=\"next-memento\"; datetime=\""
+ + ">;rel=\"next \"; datetime=\""
+ httpformatterl.format(closestright
.getCaptureDate()) + "\"");
} else {
- int m_index = sb.lastIndexOf("\"last-memento\"");
- sb.insert(m_index + 1, "next-memento ");
+ int m_index = sb.lastIndexOf("\"last memento\"");
+ sb.insert(m_index + 1, "next ");
}
}
@@ -231,7 +231,6 @@
response.setHeader("Link", "<" + agguri + ">;rel=\"timebundle\""
+ origlink + sb.toString() + timemap); //added timemap
- response.setHeader("TCN", "choice");
response.setHeader("Location", replayUrl);
response.sendError(302, "Found");
%>
\ No newline at end of file
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/ORE.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/ORE.jsp 2010-11-11 05:47:25 UTC (rev 3331)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/ORE.jsp 2010-11-11 05:49:07 UTC (rev 3332)
@@ -108,7 +108,7 @@
linkbf.append(",<" + replayPrefix
+ "timegate/" + u + ">;rel=\"timegate\"\n");
linkbf.append(",<" + queryPrefix + "timemap/" + format + "/" + u
- + ">;rel=\"timemap\";type=\"text/csv\"\n");
+ + ">;rel=\"timemap\";type=\"application/link-format\"\n");
String firstmemento = null;
int count = 0;
@@ -142,7 +142,7 @@
if (startdate == null) {
if (firstmemento == null) {
linkbf.append(",<" + resurl
- + ">;rel=\"first-memento\";datetime=\""
+ + ">;rel=\"first memento\";datetime=\""
+ httpformatterl.format(enddate) + "\"\n");
firstmemento = "firstmemento";
@@ -226,7 +226,7 @@
if (count > 0) {
int m_index = linkbf.lastIndexOf("\"memento\"");
- linkbf.insert(m_index + 1, "last-");
+ linkbf.insert(m_index + 1, "last ");
}
ORESerialiser serial = null;
@@ -249,7 +249,7 @@
else if (format.equals("link")) {
PrintWriter pw = response.getWriter();
- response.setContentType("text/csv");
+ response.setContentType("application/link-format");
pw.print(linkbf.toString());
pw.flush();
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/MementoValidity.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/MementoValidity.jsp 2010-11-11 05:47:25 UTC (rev 3331)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/MementoValidity.jsp 2010-11-11 05:49:07 UTC (rev 3332)
@@ -29,7 +29,7 @@
String timemap = " , <"
+ results.getContextConfig("aggregationPrefix")
+ "timemap/link/" + u
- + ">;rel=\"timemap\"; type=\"text/csv\"";
+ + ">;rel=\"timemap\"; type=\"application/link-format\"";
String timegate = ",<" + uriPrefix + "timegate/" + u
+ ">;rel=\"timegate\"";
@@ -52,31 +52,31 @@
+ formatterk.format(f)
+ "/"
+ u
- + ">;rel=\"first-memento memento last-memento\"; datetime=\""
+ + ">;rel=\"first last memento\"; datetime=\""
+ httpformatterl.format(f) + "\"";
} else if (closestDate.equals(f)) {
mfl = ", <" + uriPrefix + formatterk.format(f) + "/" + u
- + ">;rel=\"first-memento memento\"; datetime=\""
+ + ">;rel=\"first memento\"; datetime=\""
+ httpformatterl.format(f) + "\"";
mfl = mfl + ", <" + uriPrefix + formatterk.format(l) + "/" + u
- + ">;rel=\"last-memento\"; datetime=\""
+ + ">;rel=\"last memento\"; datetime=\""
+ httpformatterl.format(l) + "\"";
} else if (closestDate.equals(l)) {
mfl = ", <" + uriPrefix + formatterk.format(l) + "/" + u
- + ">;rel=\"last-memento memento\"; datetime=\""
+ + ">;rel=\"last memento\"; datetime=\""
+ httpformatterl.format(l) + "\"";
mfl = mfl + ", <" + uriPrefix + formatterk.format(f) + "/" + u
- + ">;rel=\"first-memento\"; datetime=\""
+ + ">;rel=\"first memento\"; datetime=\""
+ httpformatterl.format(f) + "\"";
} else {
mfl = memento;
mfl = mfl + ", <" + uriPrefix + formatterk.format(l) + "/" + u
- + ">;rel=\"last-memento\"; datetime=\""
+ + ">;rel=\"last memento\"; datetime=\""
+ httpformatterl.format(l) + "\"";
mfl = mfl + ", <" + uriPrefix + formatterk.format(f) + "/" + u
- + ">;rel=\"first-memento\"; datetime=\""
+ + ">;rel=\"first memento\"; datetime=\""
+ httpformatterl.format(f) + "\"";
}
@@ -128,12 +128,12 @@
+ formatterk.format(closestleft.getCaptureDate())
+ "/"
+ u
- + ">;rel=\"prev-memento\"; datetime=\""
+ + ">;rel=\"prev memento\"; datetime=\""
+ httpformatterl.format(closestleft
.getCaptureDate()) + "\"");
} else {
- int m_index = sb.lastIndexOf("\"first-memento\"");
- sb.insert(m_index + 1, "prev-memento ");
+ int m_index = sb.lastIndexOf("\"first memento\"");
+ sb.insert(m_index + 1, "prev ");
}
}
@@ -144,12 +144,12 @@
+ formatterk.format(closestright.getCaptureDate())
+ "/"
+ u
- + ">;rel=\"next-memento\"; datetime=\""
+ + ">;rel=\"next memento\"; datetime=\""
+ httpformatterl.format(closestright
.getCaptureDate()) + "\"");
} else {
- int m_index = sb.lastIndexOf("\"last-memento\"");
- sb.insert(m_index + 1, "next-memento ");
+ int m_index = sb.lastIndexOf("\"last memento\"");
+ sb.insert(m_index + 1, "next ");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
