Skip to content

Add option to disable immediate redirect on singular results #4712

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,12 @@ public final class Configuration {
*/
private boolean navigateWindowEnabled;

/**
* If true, redirect to a single result when a single search result is found.
*/
private boolean redirectOnSingleSearchResult;


private SuggesterConfig suggesterConfig = new SuggesterConfig();

private StatsdConfig statsdConfig = new StatsdConfig();
Expand Down Expand Up @@ -604,6 +610,7 @@ public Configuration() {
setQuickContextScan(true);
//below can cause an outofmemory error, since it is defaulting to NO LIMIT
setRamBufferSize(DEFAULT_RAM_BUFFER_SIZE); //MB
setRedirectOnSingleSearchResult(true);
setRemoteScmSupported(RemoteSCM.OFF);
setRepositories(new ArrayList<>());
setReviewPattern("\\b(\\d{4}/\\d{3})\\b"); // in form e.g. PSARC 2008/305
Expand Down Expand Up @@ -1234,6 +1241,14 @@ public void setDisplayRepositories(boolean flag) {
this.displayRepositories = flag;
}

public boolean isRedirectOnSingleSearchResult() {
return redirectOnSingleSearchResult;
}

public void setRedirectOnSingleSearchResult(boolean flag) {
this.redirectOnSingleSearchResult = flag;
}

public boolean getListDirsFirst() {
return listDirsFirst;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1437,6 +1437,14 @@ public void setDisplayRepositories(boolean displayRepositories) {
syncWriteConfiguration(displayRepositories, Configuration::setDisplayRepositories);
}

public boolean isRedirectOnSingleSearchResult() {
return syncReadConfiguration(Configuration::isRedirectOnSingleSearchResult);
}

public void setRedirectOnSingleSearchResult(boolean redirectOnSingleSearchResult) {
syncWriteConfiguration(redirectOnSingleSearchResult, Configuration::setRedirectOnSingleSearchResult);
}

public boolean getListDirsFirst() {
return syncReadConfiguration(Configuration::getListDirsFirst);
}
Expand Down
7 changes: 6 additions & 1 deletion opengrok-web/src/main/java/org/opengrok/web/PageConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -1520,15 +1520,20 @@ public SearchHelper prepareSearch() {
* @return a search helper.
*/
public SearchHelper prepareInternalSearch(SortOrder sortOrder) {
boolean isRedirectOnSingleSearchResult = getEnv().isRedirectOnSingleSearchResult();
String xrValue = req.getParameter(QueryParameters.NO_REDIRECT_PARAM);
if (xrValue != null && !xrValue.isEmpty()) {
isRedirectOnSingleSearchResult = false;
}

return new SearchHelper.Builder(getDataRoot(), new File(getSourceRootPath()), getEftarReader(),
getQueryBuilder(), req.getContextPath())
.start(getStartIndex())
.order(sortOrder)
.maxItems(getMaxItems())
.crossRefSearch(getPrefix() == Prefix.SEARCH_R)
.guiSearch(getPrefix() == Prefix.SEARCH_R || getPrefix() == Prefix.SEARCH_P)
.noRedirect(xrValue != null && !xrValue.isEmpty())
.noRedirect(!isRedirectOnSingleSearchResult)
.build();
}

Expand Down
Loading