From: <bra...@us...> - 2010-01-12 22:27:24
|
Revision: 2945 http://archive-access.svn.sourceforge.net/archive-access/?rev=2945&view=rev Author: bradtofel Date: 2010-01-12 22:27:18 +0000 (Tue, 12 Jan 2010) Log Message: ----------- FEATURE: Added identity flag to incoming requests - the intention being to allow clients to explicitly request a raw copy of archived docs. Modified Paths: -------------- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlRequestParser.java trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/ReplayRequestParser.java trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java Added Paths: ----------- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/selector/IdentityRequestSelector.java Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlRequestParser.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlRequestParser.java 2010-01-12 22:24:04 UTC (rev 2944) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlRequestParser.java 2010-01-12 22:27:18 UTC (rev 2945) @@ -59,6 +59,10 @@ */ public final static String IMG_CONTEXT = "im"; /** + * raw/identity context + */ + public final static String IDENTITY_CONTEXT = "id"; + /** * Charset detection strategy context - should be followed by an integer * indicating which strategy to use */ Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/ReplayRequestParser.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/ReplayRequestParser.java 2010-01-12 22:24:04 UTC (rev 2944) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/ReplayRequestParser.java 2010-01-12 22:27:18 UTC (rev 2945) @@ -124,6 +124,8 @@ wbRequest.setJSContext(true); } else if(flag.equals(ArchivalUrlRequestParser.IMG_CONTEXT)) { wbRequest.setIMGContext(true); + } else if(flag.equals(ArchivalUrlRequestParser.IDENTITY_CONTEXT)) { + wbRequest.setIdentityContext(true); } else if(flag.startsWith(ArchivalUrlRequestParser.CHARSET_MODE)) { String modeString = flag.substring( ArchivalUrlRequestParser.CHARSET_MODE.length()); Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2010-01-12 22:24:04 UTC (rev 2944) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2010-01-12 22:27:18 UTC (rev 2945) @@ -262,6 +262,12 @@ public static final String REQUEST_IMAGE_CONTEXT = "imagecontext"; /** + * Request: Identity context requested (totally transparent) + */ + public static final String REQUEST_IDENTITY_CONTEXT = "identitycontext"; + + + /** * Request: Charset detection mode */ public static final String REQUEST_CHARSET_MODE = "charsetmode"; @@ -488,6 +494,7 @@ this.exclusionFilter = exclusionFilter; } + @Deprecated public ObjectFilter<CaptureSearchResult> getResultFilters() { ObjectFilterChain<CaptureSearchResult> tmpFilters = new ObjectFilterChain<CaptureSearchResult>(); @@ -772,6 +779,13 @@ return getBoolean(REQUEST_IMAGE_CONTEXT); } + public void setIdentityContext(boolean isIdentityContext) { + setBoolean(REQUEST_IDENTITY_CONTEXT,isIdentityContext); + } + public boolean isIdentityContext() { + return getBoolean(REQUEST_IDENTITY_CONTEXT); + } + public void setCharsetMode(int mode) { setInt(REQUEST_CHARSET_MODE,mode); } Added: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/selector/IdentityRequestSelector.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/selector/IdentityRequestSelector.java (rev 0) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/selector/IdentityRequestSelector.java 2010-01-12 22:27:18 UTC (rev 2945) @@ -0,0 +1,48 @@ +/* IdentityRequestSelector + * + * $Id$: + * + * Created on Dec 17, 2009. + * + * Copyright (C) 2006 Internet Archive. + * + * This file is part of Wayback. + * + * Wayback is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * any later version. + * + * Wayback is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser Public License for more details. + * + * You should have received a copy of the GNU Lesser Public License + * along with Wayback; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +package org.archive.wayback.replay.selector; + +import org.archive.wayback.core.CaptureSearchResult; +import org.archive.wayback.core.Resource; +import org.archive.wayback.core.WaybackRequest; + +/** + * @author brad + * + */ +public class IdentityRequestSelector extends BaseReplayRendererSelector { + + /* (non-Javadoc) + * @see org.archive.wayback.replay.selector.BaseReplayRendererSelector#canHandle(org.archive.wayback.core.WaybackRequest, org.archive.wayback.core.CaptureSearchResult, org.archive.wayback.core.Resource) + */ + @Override + public boolean canHandle(WaybackRequest wbRequest, + CaptureSearchResult result, Resource resource) { + return wbRequest.isIdentityContext(); + } + + +} Property changes on: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/selector/IdentityRequestSelector.java ___________________________________________________________________ Added: svn:keywords + Author Date Revision Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |