[MRM-749]

o integrate search within search results in webapp


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-nexus-indexer@739940 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Maria Odea B. Ching 2009-02-02 08:27:15 +00:00
parent 66caf5f56e
commit f3a0c76b37
1 changed files with 15 additions and 14 deletions

View File

@ -255,23 +255,24 @@ public class SearchAction
}
else
{
if( searchResultsOnly && !completeQueryString.equals( "" ) )
try
{
results = crossRepoSearch.searchForTerm( getPrincipal(), selectedRepos, q, limits, parseCompleteQueryString() );
if( searchResultsOnly && !completeQueryString.equals( "" ) )
{
//results = crossRepoSearch.searchForTerm( getPrincipal(), selectedRepos, q, limits, parseCompleteQueryString() );
results = getNexusSearch().search( getPrincipal(), selectedRepos, q, limits, parseCompleteQueryString() );
}
else
{
completeQueryString = "";
//results = crossRepoSearch.searchForTerm( getPrincipal(), selectedRepos, q, limits );
results = getNexusSearch().search( getPrincipal(), selectedRepos, q, limits, null );
}
}
else
catch ( RepositorySearchException e )
{
completeQueryString = "";
//results = crossRepoSearch.searchForTerm( getPrincipal(), selectedRepos, q, limits );
try
{
results = getNexusSearch().search( getPrincipal(), selectedRepos, q, limits, null );
}
catch ( RepositorySearchException e )
{
addActionError( e.getMessage() );
return ERROR;
}
addActionError( e.getMessage() );
return ERROR;
}
}