Implemented proper collapseOverride

git-svn-id: file:///opt/svn/repositories/sonatype.org/nexus/trunk@6662 2aa8b3fc-8ebb-4439-a84f-95066eaea8ab
sonatype · Jun 22, 2010 · 02ef831 · 02ef831
1 parent 5277af2
commit 02ef831
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/...ene-rest-api/src/main/java/org/sonatype/nexus/rest/index/AbstractIndexPlexusResource.java b/...ene-rest-api/src/main/java/org/sonatype/nexus/rest/index/AbstractIndexPlexusResource.java
@@ -182,6 +182,16 @@ public Object get( Context context, Request request, Response response, Variant
                 else
                 {
                     result.setData( new ArrayList<NexusArtifact>( ai2NaColl( request, searchResult.getResults() ) ) );
+
+                    // if we had collapseResults ON, and the totalHits are larger than actual (filtered) results, and
+                    // the actual result count is below COLLAPSE_OVERRIDE_TRESHOLD, then repeat without collapse
+                    if ( collapseResults && result.getData().size() < searchResult.getTotalHits()
+                        && result.getData().size() < COLLAPSE_OVERRIDE_TRESHOLD )
+                    {
+                        collapseResults = false;
+
+                        continue;
+                    }
                 }
 
                 // we came here, so we break the while-loop, we got what we need