Author: oching
Date: Mon Feb 2 08:27:15 2009
New Revision: 739940
URL: http://svn.apache.org/viewvc?rev=739940&view=rev
Log:
[MRM-749]
o integrate search within search results in webapp
Modified:
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
Modified:
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java?rev=739940&r1=739939&r2=739940&view=diff
==============================================================================
---
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
(original)
+++
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
Mon Feb 2 08:27:15 2009
@@ -255,24 +255,25 @@
}
else
{
- if( searchResultsOnly && !completeQueryString.equals( "" ) )
+ try
{
- results = crossRepoSearch.searchForTerm( getPrincipal(),
selectedRepos, q, limits, parseCompleteQueryString() );
- }
- else
- {
- completeQueryString = "";
- //results = crossRepoSearch.searchForTerm( getPrincipal(),
selectedRepos, q, limits );
- try
+ if( searchResultsOnly && !completeQueryString.equals( "" ) )
{
- results = getNexusSearch().search( getPrincipal(),
selectedRepos, q, limits, null );
+ //results = crossRepoSearch.searchForTerm( getPrincipal(),
selectedRepos, q, limits, parseCompleteQueryString() );
+ results = getNexusSearch().search( getPrincipal(),
selectedRepos, q, limits, parseCompleteQueryString() );
}
- catch ( RepositorySearchException e )
+ else
{
- addActionError( e.getMessage() );
- return ERROR;
+ completeQueryString = "";
+ //results = crossRepoSearch.searchForTerm( getPrincipal(),
selectedRepos, q, limits );
+ results = getNexusSearch().search( getPrincipal(),
selectedRepos, q, limits, null );
}
}
+ catch ( RepositorySearchException e )
+ {
+ addActionError( e.getMessage() );
+ return ERROR;
+ }
}
if ( results.isEmpty() )
