Skip to content

Allow ReplayCaptureSelector to be set in spring #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow ReplayCaptureSelector to be set in spring #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions wayback-core/src/main/java/org/archive/wayback/replay/DefaultReplayCaptureSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ public class DefaultReplayCaptureSelector implements ReplayCaptureSelector {

private CaptureSearchResult currentClosest;

public DefaultReplayCaptureSelector() {
}

/**
* Initialize object with {@link ReplayDispatcher}, to which
* closest-selection is delegated.
Expand Down Expand Up @@ -174,4 +177,12 @@ protected CaptureSearchResult findNextClosest() {
return next;
}
}

public CaptureSearchResult getCurrentClosest() {
return currentClosest;
}

public long getRequestMS() {
return requestMS;
}
}
13 changes: 12 additions & 1 deletion wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
import org.archive.wayback.util.url.UrlOperations;
import org.archive.wayback.util.webapp.AbstractRequestHandler;
import org.archive.wayback.util.webapp.ShutdownListener;
import org.archive.wayback.util.webapp.SpringReader;
import org.archive.wayback.webapp.LiveWebRedirector.LiveWebState;

/**
Expand Down Expand Up @@ -196,6 +197,8 @@ public static enum PerfStat {
private int maxRedirectAttempts = 0;

private boolean fixedEmbeds = false;

private ReplayCaptureSelector captureSelector = null;

public void init() {
checkAccessPointAware(collection,exception,query,parser,replay,
Expand Down Expand Up @@ -775,7 +778,7 @@ protected void handleReplay(WaybackRequest wbRequest,
p.queried();
}

ReplayCaptureSelector captureSelector = new DefaultReplayCaptureSelector(getReplay());
ReplayCaptureSelector captureSelector = (ReplayCaptureSelector)SpringReader.getCurrentContext().getBean("captureSelector", new Object [] { getReplay() });
captureSelector.setRequest(wbRequest);
captureSelector.setCaptures(captureResults);

Expand Down Expand Up @@ -1944,4 +1947,12 @@ public void setPerfStatsHeaderFormat(
PerfStats.OutputFormat perfStatsHeaderFormat) {
this.perfStatsHeaderFormat = perfStatsHeaderFormat;
}

public ReplayCaptureSelector getCaptureSelector() {
return captureSelector;
}

public void setCaptureSelector(ReplayCaptureSelector captureSelector) {
this.captureSelector = captureSelector;
}
}