git-svn-id: file:///opt/svn/repositories/sonatype.org/nexus/tags/nexu…

…s-1.7.1@6707 2aa8b3fc-8ebb-4439-a84f-95066eaea8ab
sonatype · Jul 2, 2010 · 800918e · 800918e
2 parents 0b410df + 06f6e13
commit 800918e
Show file tree

Hide file tree

Showing 8 changed files with 194 additions and 123 deletions.
diff --git a/...ore-plugins/nexus-plugin-console-plugin/src/main/js/static/js/repoServer.PluginInfoTab.js b/...ore-plugins/nexus-plugin-console-plugin/src/main/js/static/js/repoServer.PluginInfoTab.js
@@ -115,7 +115,7 @@ Ext.extend(Sonatype.repoServer.PluginInfoTab, Ext.Panel, {
         }
 
         var documentation = this.payload.data.documentation;
-        if (!Ext.isEmpty(documentation))
+        if (!Ext.isEmpty(documentation) && documentation.length != 0)
         {
           pluginPropertiesPanel.add({
                 xtype : 'label',

diff --git a/...cene/nexus-indexer-lucene-app/src/main/java/org/sonatype/nexus/index/KeywordSearcher.java b/...cene/nexus-indexer-lucene-app/src/main/java/org/sonatype/nexus/index/KeywordSearcher.java
@@ -78,7 +78,22 @@ public IteratorSearchResponse flatIteratorSearch( Map<String, String> terms, Str
             return IteratorSearchResponse.EMPTY_ITERATOR_SEARCH_RESPONSE;
         }
 
-        return m_lucene.searchArtifactIterator( terms.get( TERM_KEYWORD ), repositoryId, from, count, hitLimit, true,
+        boolean uniqueRGA = false;
+
+        if ( filters != null )
+        {
+            for ( ArtifactInfoFilter filter : filters )
+            {
+                if ( filter instanceof UniqueArtifactFilterPostprocessor )
+                {
+                    uniqueRGA = true;
+
+                    break;
+                }
+            }
+        }
+
+        return m_lucene.searchArtifactIterator( terms.get( TERM_KEYWORD ), repositoryId, from, count, hitLimit, uniqueRGA,
             searchType, filters );
     }
 

diff --git a/...s-indexer-lucene-app/src/main/java/org/sonatype/nexus/index/MavenCoordinatesSearcher.java b/...s-indexer-lucene-app/src/main/java/org/sonatype/nexus/index/MavenCoordinatesSearcher.java
@@ -104,8 +104,6 @@ public IteratorSearchResponse flatIteratorSearch( Map<String, String> terms, Str
             return IteratorSearchResponse.EMPTY_ITERATOR_SEARCH_RESPONSE;
         }
 
-        boolean collapseRepos = true;
-
         // if the user is querying against these fields, we want to return them properly
         if ( filters != null )
         {
@@ -115,30 +113,21 @@ public IteratorSearchResponse flatIteratorSearch( Map<String, String> terms, Str
                 {
                     UniqueArtifactFilterPostprocessor uFilter = (UniqueArtifactFilterPostprocessor) filter;
 
-                    int found = 0;
                     if ( terms.containsKey( MavenCoordinatesSearcher.TERM_VERSION ) )
                     {
                         uFilter.addField( MAVEN.VERSION );
-                        found++;
                     }
                     if ( terms.containsKey( MavenCoordinatesSearcher.TERM_PACKAGING ) )
                     {
                         uFilter.addField( MAVEN.PACKAGING );
-                        found++;
                     }
                     if ( terms.containsKey( MavenCoordinatesSearcher.TERM_CLASSIFIER ) )
                     {
                         uFilter.addField( MAVEN.CLASSIFIER );
-                        found++;
                     }
 
-                    // if we have matched against at least 2 of these, that means we are doing
-                    // full search, and NOT aggregation
-                    if ( found >= 2 )
-                    {
+                    // in GAV search, we _always_ expand repository
                         uFilter.addField( MAVEN.REPOSITORY_ID );
-                        collapseRepos = false;
-                    }
 
                     break;
                 }
@@ -147,7 +136,7 @@ public IteratorSearchResponse flatIteratorSearch( Map<String, String> terms, Str
 
         return m_lucene.searchArtifactIterator( terms.get( TERM_GROUP ), terms.get( TERM_ARTIFACT ),
             terms.get( TERM_VERSION ), terms.get( TERM_PACKAGING ), terms.get( TERM_CLASSIFIER ), repositoryId, from,
-            count, hitLimit, collapseRepos, searchType, filters );
+            count, hitLimit, false, searchType, filters );
     }
 
 }