[Archive-access-cvs] SF.net SVN: archive-access:[3513] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java

[<bra...@us...>]

Revision: 3513
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3513&view=rev
Author:   bradtofel
Date:     2011-09-06 03:46:44 +0000 (Tue, 06 Sep 2011)
Log Message:
-----------
FEATURE:
   - added configuration to force clean queries, rather than forcing it to be active
   - added configuration of additional AccessPoint specific filter factories for search results
   - implemented AccessPointAware configuration of collaborating components

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2011-09-06 03:43:17 UTC (rev 3512)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2011-09-06 03:46:44 UTC (rev 3513)
@@ -102,6 +102,7 @@
 	private boolean serveStatic = true;
 	private boolean bounceToReplayPrefix = false;
 	private boolean bounceToQueryPrefix = false;
+	private boolean forceCleanQueries = false;
 
 	private String liveWebPrefix = null;
 	private String staticPrefix = null;
@@ -130,7 +131,13 @@
 	private ExclusionFilterFactory exclusionFactory = null;
 	private BooleanOperator<WaybackRequest> authentication = null;
 	private long embargoMS = 0;
+	private CustomResultFilterFactory filterFactory = null;
 
+	public void init() {
+		checkAccessPointAware(collection,exception,query,parser,replay,
+				uriConverter,exclusionFactory, authentication, filterFactory);
+	}
+	
 	protected boolean dispatchLocal(HttpServletRequest httpRequest,
 			HttpServletResponse httpResponse) 
 	throws ServletException, IOException {
@@ -284,6 +291,17 @@
 		}
 	}
 
+	protected void checkAccessPointAware(Object...os) {
+		if(os != null) {
+			for(Object o : os) {
+				if(o instanceof AccessPointAware) {
+					AccessPointAware apa = (AccessPointAware) o;
+					apa.setAccessPoint(this);
+				}
+			}
+		}
+	}
+	
 	private void checkInterstitialRedirect(HttpServletRequest httpRequest,
 			WaybackRequest wbRequest) 
 	throws BetterRequestException {
@@ -323,7 +341,7 @@
 		}
 	}
 	
-	private void handleReplay(WaybackRequest wbRequest, 
+	protected void handleReplay(WaybackRequest wbRequest, 
 			HttpServletRequest httpRequest, HttpServletResponse httpResponse) 
 	throws IOException, ServletException, WaybackException {
 		Resource resource = null;
@@ -399,7 +417,7 @@
 		}
 	}
 	
-	private void handleQuery(WaybackRequest wbRequest, 
+	protected void handleQuery(WaybackRequest wbRequest, 
 			HttpServletRequest httpRequest, HttpServletResponse httpResponse) 
 	throws ServletException, IOException, WaybackException {
 
@@ -909,4 +927,32 @@
 	public void setEmbargoMS(long ms) {
 		this.embargoMS = ms;
 	}
+
+	/**
+	 * @return the forceCleanQueries
+	 */
+	public boolean isForceCleanQueries() {
+		return forceCleanQueries;
+	}
+
+	/**
+	 * @param forceCleanQueries the forceCleanQueries to set
+	 */
+	public void setForceCleanQueries(boolean forceCleanQueries) {
+		this.forceCleanQueries = forceCleanQueries;
+	}
+
+	/**
+	 * @param filterFactory the filterFactory to set
+	 */
+	public void setFilterFactory(CustomResultFilterFactory filterFactory) {
+		this.filterFactory = filterFactory;
+	}
+
+	/**
+	 * @return the filterFactory
+	 */
+	public CustomResultFilterFactory getFilterFactory() {
+		return filterFactory;
+	}
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.