svn commit: r676854 - /archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java

[oching]

Author: oching
Date: Tue Jul 15 02:59:23 2008
New Revision: 676854

URL: http://svn.apache.org/viewvc?rev=676854&view=rev
Log:
include the bytecode index to the searcheables in searchForTerm(..) instead of 
just searching it if the file content search returned 
nothing

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java?rev=676854&r1=676853&r2=676854&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java
 Tue Jul 15 02:59:23 2008
@@ -123,6 +123,8 @@
     public SearchResults searchForTerm( String principal, List<String> 
selectedRepos, String term, SearchResultLimits limits )
     {
         List<RepositoryContentIndex> indexes = getFileContentIndexes( 
principal, selectedRepos );
+        List<RepositoryContentIndex> bytecodeIndices = getBytecodeIndexes( 
principal, selectedRepos );        
+        indexes.addAll( bytecodeIndices );
 
         try
         {
@@ -131,11 +133,6 @@
             SearchResults results = searchAll( query, limits, indexes );
             results.getRepositories().addAll( this.localIndexedRepositories );
             
-            if( results.getTotalHits() == 0 )
-            {
-                results = searchForBytecode( principal, selectedRepos, term, 
limits );             
-            }
-
             return results;
         }
         catch ( ParseException e )