Revision: 2355
http://archive-access.svn.sourceforge.net/archive-access/?rev=2355&view=rev
Author: bradtofel
Date: 2008-07-01 16:24:50 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
REFACTOR: SearchResult => (Url|Capture)SearchResult
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/oracleclient/OracleExclusionFilter.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/oracleclient/OracleExclusionFilterFactory.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/oracleclient/OracleExclusionFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/oracleclient/OracleExclusionFilter.java 2008-07-01 23:23:28 UTC (rev 2354)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/oracleclient/OracleExclusionFilter.java 2008-07-01 23:24:50 UTC (rev 2355)
@@ -6,13 +6,10 @@
import org.archive.accesscontrol.RobotsUnavailableException;
import org.archive.accesscontrol.RuleOracleUnavailableException;
import org.archive.util.ArchiveUtils;
-import org.archive.wayback.WaybackConstants;
-import org.archive.wayback.core.SearchResult;
-import org.archive.wayback.core.Timestamp;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.util.ObjectFilter;
-public class OracleExclusionFilter implements ObjectFilter<SearchResult> {
- ObjectFilter<SearchResult> robotFilter = null;
+public class OracleExclusionFilter implements ObjectFilter<CaptureSearchResult> {
AccessControlClient client = null;
private String accessGroup = null;
@@ -27,10 +24,9 @@
}
- public int filterObject(SearchResult o) {
- String url = o.get(WaybackConstants.RESULT_URL);
- Date captureDate = Timestamp.parseBefore(
- o.get(WaybackConstants.RESULT_CAPTURE_DATE)).getDate();
+ public int filterObject(CaptureSearchResult o) {
+ String url = o.getOriginalUrl();
+ Date captureDate = o.getCaptureDate();
Date retrievalDate = new Date();
String policy;
@@ -60,12 +56,4 @@
}
return FILTER_EXCLUDE;
}
-
- public ObjectFilter<SearchResult> getRobotFilter() {
- return robotFilter;
- }
-
- public void setRobotFilter(ObjectFilter<SearchResult> robotFilter) {
- this.robotFilter = robotFilter;
- }
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/oracleclient/OracleExclusionFilterFactory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/oracleclient/OracleExclusionFilterFactory.java 2008-07-01 23:23:28 UTC (rev 2354)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/oracleclient/OracleExclusionFilterFactory.java 2008-07-01 23:24:50 UTC (rev 2355)
@@ -1,22 +1,17 @@
package org.archive.wayback.accesscontrol.oracleclient;
import org.archive.wayback.accesscontrol.ExclusionFilterFactory;
-import org.archive.wayback.accesscontrol.robotstxt.RobotExclusionFilterFactory;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.util.ObjectFilter;
public class OracleExclusionFilterFactory implements ExclusionFilterFactory {
- private RobotExclusionFilterFactory robotFactory = null;
private String oracleUrl = null;
private String accessGroup = null;
- public ObjectFilter<SearchResult> get() {
+ public ObjectFilter<CaptureSearchResult> get() {
OracleExclusionFilter filter = new OracleExclusionFilter(oracleUrl,
accessGroup);
- if(robotFactory != null) {
- filter.setRobotFilter(robotFactory.get());
- }
return filter;
}
@@ -24,14 +19,6 @@
// no-op... yet..
}
- public RobotExclusionFilterFactory getRobotFactory() {
- return robotFactory;
- }
-
- public void setRobotFactory(RobotExclusionFilterFactory robotFactory) {
- this.robotFactory = robotFactory;
- }
-
public String getOracleUrl() {
return oracleUrl;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
