You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2009/02/02 10:46:32 UTC
svn commit: r739952 - in
/archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-indexer/src:
main/java/org/apache/archiva/indexer/search/
test/java/org/apache/archiva/indexer/search/
Author: oching
Date: Mon Feb 2 09:46:31 2009
New Revision: 739952
URL: http://svn.apache.org/viewvc?rev=739952&view=rev
Log:
[MRM-749]
o fixed pagination
Modified:
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
Modified: archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java?rev=739952&r1=739951&r2=739952&view=diff
==============================================================================
--- archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java (original)
+++ archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java Mon Feb 2 09:46:31 2009
@@ -263,7 +263,7 @@
for ( int i = 0; i < fetchCount; i++ )
{
// Stop fetching if we are past the total # of available hits.
- if ( offset + i > results.getTotalHits() )
+ if ( offset + i >= results.getHits().size() )
{
break;
}
@@ -280,7 +280,7 @@
}
}
}
- paginated.setTotalHits( paginated.getHitsMap().size() );
+ paginated.setTotalHits( results.getTotalHits() );
return paginated;
}
Modified: archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java?rev=739952&r1=739951&r2=739952&view=diff
==============================================================================
--- archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java (original)
+++ archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java Mon Feb 2 09:46:31 2009
@@ -201,7 +201,8 @@
archivaConfigControl.verify();
assertNotNull( results );
- assertEquals( 1, results.getTotalHits() );
+ assertEquals( 1, results.getHits().size() );
+ assertEquals( 2, results.getTotalHits() );
archivaConfigControl.reset();
@@ -218,7 +219,8 @@
archivaConfigControl.verify();
assertNotNull( results );
- assertEquals( 1, results.getTotalHits() );
+ assertEquals( 1, results.getHits().size() );
+ assertEquals( 2, results.getTotalHits() );
}
public void testArtifactFoundInMultipleRepositories()