svn commit: r740576 - in /archiva/trunk/archiva-modules: archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/ archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/ archiva-web/archiva-webapp/src/main/jav...

[oching]

Author: oching
Date: Wed Feb  4 02:16:11 2009
New Revision: 740576

URL: http://svn.apache.org/viewvc?rev=740576&view=rev
Log:
[MRM-933]
o set search result limits of the returned search results

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
    
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.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=740576&r1=740575&r2=740576&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
 Wed Feb  4 02:16:11 2009
@@ -151,7 +151,9 @@
             
             if( response == null || response.getTotalHits() == 0 )
             {
-                return new SearchResults();
+                SearchResults results = new SearchResults();
+                results.setLimits( limits );
+                return results;
             }
             
             return convertToSearchResults( response, limits );
@@ -272,6 +274,7 @@
         }
         
         results.setTotalHits( results.getHitsMap().size() );
+        results.setLimits( limits );
         
         if( limits == null || limits.getSelectedPage() == 
SearchResultLimits.ALL_PAGES )
         {   
@@ -279,13 +282,15 @@
         }
         else
         {
-            return paginate( limits, results );            
+            return paginate( results );            
         }        
     }
 
-    private SearchResults paginate( SearchResultLimits limits, SearchResults 
results )
+    private SearchResults paginate( SearchResults results )
     {
-        SearchResults paginated = new SearchResults();        
+        SearchResultLimits limits = results.getLimits();
+        SearchResults paginated = new SearchResults();  
+        
         int fetchCount = limits.getPageSize();
         int offset = ( limits.getSelectedPage() * limits.getPageSize() );
         
@@ -319,6 +324,7 @@
             }
         }            
         paginated.setTotalHits( results.getTotalHits() );
+        paginated.setLimits( limits );
         
         return paginated;
     }

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java?rev=740576&r1=740575&r2=740576&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
 Wed Feb  4 02:16:11 2009
@@ -203,6 +203,7 @@
         assertNotNull( results );
         assertEquals( 1, results.getHits().size() );
         assertEquals( 2, results.getTotalHits() );
+        assertEquals( limits, results.getLimits() );
 
         archivaConfigControl.reset();
 
@@ -221,6 +222,7 @@
         assertNotNull( results );
         assertEquals( 1, results.getHits().size() );
         assertEquals( 2, results.getTotalHits() );
+        assertEquals( limits, results.getLimits() );
     }
 
     public void testArtifactFoundInMultipleRepositories()

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java?rev=740576&r1=740575&r2=740576&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
 Wed Feb  4 02:16:11 2009
@@ -193,9 +193,8 @@
         }
 
         SearchFields searchFields = new SearchFields( groupId, artifactId, 
version, null, className, selectedRepos );
-        
-        
-        // TODO: add packaging in the list of fields for advanced search (UI)
+                
+        // TODO: add packaging in the list of fields for advanced search (UI)?
         try
         {
             results = getNexusSearch().search( getPrincipal(), searchFields, 
limits );