You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jd...@apache.org on 2009/02/10 07:12:33 UTC
svn commit: r742863 - in
/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer:
search/NexusRepositorySearch.java util/SearchUtil.java
Author: jdumay
Date: Tue Feb 10 06:12:32 2009
New Revision: 742863
URL: http://svn.apache.org/viewvc?rev=742863&view=rev
Log:
Reverting earlier change to SearchUtil
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/main/java/org/apache/archiva/indexer/util/SearchUtil.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=742863&r1=742862&r2=742863&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 Tue Feb 10 06:12:32 2009
@@ -25,6 +25,7 @@
import java.util.Map;
import java.util.Set;
+import org.apache.archiva.indexer.util.SearchUtil;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
@@ -247,7 +248,7 @@
for ( ArtifactInfo artifactInfo : artifactInfos )
{
- String id = getHitId( artifactInfo.groupId, artifactInfo.artifactId );
+ String id = SearchUtil.getHitId( artifactInfo.groupId, artifactInfo.artifactId );
Map<String, SearchResultHit> hitsMap = results.getHitsMap();
SearchResultHit hit = hitsMap.get( id );
@@ -313,7 +314,7 @@
SearchResultHit hit = results.getHits().get( ( offset + i ) );
if( hit != null )
{
- String id = getHitId( hit.getGroupId(), hit.getArtifactId() );
+ String id = SearchUtil.getHitId( hit.getGroupId(), hit.getArtifactId() );
paginated.addHit( id, hit );
}
else
@@ -327,9 +328,4 @@
return paginated;
}
-
- private static String getHitId( String groupId, String artifactId )
- {
- return groupId + ":" + artifactId;
- }
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/util/SearchUtil.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/util/SearchUtil.java?rev=742863&r1=742862&r2=742863&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/util/SearchUtil.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/util/SearchUtil.java Tue Feb 10 06:12:32 2009
@@ -19,8 +19,6 @@
* under the License.
*/
-import org.apache.commons.lang.StringUtils;
-
/**
* SearchUtil - utility class for search.
*
@@ -28,38 +26,6 @@
*/
public class SearchUtil
{
- public static final String BYTECODE_KEYWORD = "bytecode:";
-
- /**
- * Determines whether the queryString has the bytecode keyword.
- *
- * @param queryString
- * @return
- */
- public static boolean isBytecodeSearch( String queryString )
- {
- if ( queryString.startsWith( BYTECODE_KEYWORD ) )
- {
- return true;
- }
-
- return false;
- }
-
- /**
- * Removes the bytecode keyword from the query string.
- *
- * @param queryString
- * @return
- */
- public static String removeBytecodeKeyword( String queryString )
- {
- String qString = StringUtils.uncapitalize( queryString );
- qString = StringUtils.remove( queryString, BYTECODE_KEYWORD );
-
- return qString;
- }
-
public static String getHitId( String groupId, String artifactId )
{
return groupId + ":" + artifactId;