Author: oching
Date: Mon Jul 28 19:48:33 2008
New Revision: 680606
URL: http://svn.apache.org/viewvc?rev=680606&view=rev
Log:
[MRM-892]
-instead of using different keywords like 'class:', 'package:' or 'method',
just use one keyword for all which is 'bytecode:', user can just use
the filtered search for specifics once it is implemented
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumer.java?rev=680606&r1=680605&r2=680606&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexJavaPublicMethodsConsumer.java
Mon Jul 28 19:48:33 2008
@@ -148,7 +148,7 @@
bytecodeRecord.setFiles( files );
bytecodeRecord.setMethods( mapOfClassesAndMethods.get(
METHODS ) );
bytecodeRecord.setArtifact( artifact );
- bytecodeRecord.setRepositoryId(
artifact.getModel().getRepositoryId() );
+ bytecodeRecord.setRepositoryId( repoContent.getId() );
bytecodeIndex.modifyRecord( bytecodeRecord );
}
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java?rev=680606&r1=680605&r2=680606&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResults.java
Mon Jul 28 19:48:33 2008
@@ -81,7 +81,8 @@
{
hit = new SearchResultHit();
}
-
+
+ hit.setRepositoryId( bytecode.getRepositoryId() );
hit.addArtifact( bytecode.getArtifact() );
hit.setContext( null ); // TODO: provide context on why this is a
valuable hit.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java?rev=680606&r1=680605&r2=680606&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
Mon Jul 28 19:48:33 2008
@@ -91,7 +91,7 @@
private static final String COMPLETE_QUERY_STRING_SEPARATOR = ";";
- private static final String[] BYTECODE_KEYWORDS = new String[] { "class:",
"package:", "method:" };
+ private static final String BYTECODE_KEYWORD = "bytecode:";
public String quickSearch()
throws MalformedURLException, RepositoryIndexException,
RepositoryIndexSearchException
@@ -114,7 +114,7 @@
if( isBytecodeSearch( q ) )
{
- results = crossRepoSearch.searchForBytecode( getPrincipal(),
selectedRepos, removeKeywords( q ), limits );
+ results = crossRepoSearch.searchForBytecode( getPrincipal(),
selectedRepos, removeKeyword( q ), limits );
}
else
{
@@ -322,21 +322,18 @@
private boolean isBytecodeSearch( String queryString )
{
- if( queryString.startsWith( BYTECODE_KEYWORDS[0] ) ||
queryString.startsWith( BYTECODE_KEYWORDS[1] ) ||
- queryString.startsWith( BYTECODE_KEYWORDS[2] ) )
+ if( queryString.startsWith( BYTECODE_KEYWORD ) )
{
- return true;
+ return true;
}
return false;
}
- private String removeKeywords( String queryString )
+ private String removeKeyword( String queryString )
{
String qString = StringUtils.uncapitalize( queryString );
- qString = StringUtils.removeStart( queryString, BYTECODE_KEYWORDS[0] );
- qString = StringUtils.removeStart( qString, BYTECODE_KEYWORDS[1] );
- qString = StringUtils.removeStart( qString, BYTECODE_KEYWORDS[2] );
+ qString= StringUtils.remove( queryString, BYTECODE_KEYWORD );
return qString;
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf?rev=680606&r1=680605&r2=680606&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf
Mon Jul 28 19:48:33 2008
@@ -33,8 +33,8 @@
<p>
Enter your search terms. A variety of data will be searched for your
keywords.<br/>
- To search for java classes, packages or methods, append the keywords
"<i>class:</i>",
- "<i>package:</i>" or "<i>method:</i>" before your query. Example,
class:MyClass
+ To search for java classes, packages or methods, append the keyword
"<i>bytecode:</i>"
+ to your query. Example, bytecode:MyClass or bytecode:myMethod
<ww:actionerror/>
</p>
</div>
\ No newline at end of file
