diff options
| author | Maria Odea B. Ching <oching@apache.org> | 2008-07-10 07:47:38 +0000 |
|---|---|---|
| committer | Maria Odea B. Ching <oching@apache.org> | 2008-07-10 07:47:38 +0000 |
| commit | 59313f36c3d3c4fc52b6f2b89a776a3c3b6b2c7a (patch) | |
| tree | ed8241a1b46c16e36efc0036c1ec9d2624b97b51 /archiva-modules/archiva-base/archiva-indexer | |
| parent | 2b2e21c61390fc0691f8ee0fa1296528d3f57aa2 (diff) | |
| download | archiva-59313f36c3d3c4fc52b6f2b89a776a3c3b6b2c7a.tar.gz archiva-59313f36c3d3c4fc52b6f2b89a776a3c3b6b2c7a.zip | |
[MRM-861]
-fix search results hits count
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@675469 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base/archiva-indexer')
2 files changed, 2 insertions, 2 deletions
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentRecord.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentRecord.java index 7b1365b23..af039c8c7 100644 --- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentRecord.java +++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/filecontent/FileContentRecord.java @@ -64,7 +64,7 @@ public class FileContentRecord public String getPrimaryKey() { - return filename; + return repositoryId + ":" + filename; } public int hashCode() diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java index 3ff954795..469ff679b 100644 --- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java +++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java @@ -199,7 +199,7 @@ public class DefaultCrossRepositorySearch if ( offset < hitCount ) { // only process if the offset is within the hit count. - for ( int i = 0; i <= fetchCount; i++ ) + for ( int i = 0; i < fetchCount; i++ ) { // Stop fetching if we are past the total # of available hits. if ( offset + i >= hitCount ) |