svn commit: r1183443 - in /archiva/trunk/archiva-modules: archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/ archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/

[ol...@apache.org]

Author: olamy
Date: Fri Oct 14 17:49:30 2011
New Revision: 1183443

URL: http://svn.apache.org/viewvc?rev=1183443&view=rev
Log:
if searching with SearchFields with unknown repo ids do not revert to a search on all index.
small changes on previous commit: only if SearchFields has repos set to not break previous behaviour.

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
    archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java?rev=1183443&r1=1183442&r2=1183443&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java Fri Oct 14 17:49:30 2011
@@ -141,9 +141,9 @@ public class NexusRepositorySearch
 
         List<String> indexingContextIds = addIndexingContexts(searchFields.getRepositories());
 
-        // if no index found in the specified one return an empty search result instead of doing a search on all index
+        // if no index found in the specified ones return an empty search result instead of doing a search on all index
         // olamy: IMHO doesn't make sense
-        if (indexingContextIds == null || indexingContextIds.isEmpty() )
+        if ( !searchFields.getRepositories().isEmpty() && (indexingContextIds == null || indexingContextIds.isEmpty()) )
         {
             return new SearchResults();
         }

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java?rev=1183443&r1=1183442&r2=1183443&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java Fri Oct 14 17:49:30 2011
@@ -105,6 +105,7 @@ public class DefaultSearchService
         searchField.setGroupId( groupId );
         searchField.setArtifactId( artifactId );
         searchField.setPackaging( StringUtils.isBlank( packaging ) ? "jar" : packaging );
+        searchField.setRepositories( getObservableRepos() );
 
         try
         {