1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/18ab38e43d8b/ changeset: 18ab38e43d8b user: jgoecks date: 2012-10-12 04:37:44 summary: Remove Whoosh handling for Python version 2.4 and remove minscore when searching. affected #: 1 file diff -r d9e8a7eee7aac7e0ed15fce27592eb0182144889 -r 18ab38e43d8bf4e95b64b1939f243c370fdad2d9 lib/galaxy/tools/search/__init__.py --- a/lib/galaxy/tools/search/__init__.py +++ b/lib/galaxy/tools/search/__init__.py @@ -1,19 +1,13 @@ from galaxy.eggs import require from galaxy.web.framework.helpers import to_unicode -# Whoosh is compatible with Python 2.5+ Try to import Whoosh and set flag to indicate whether tool search is enabled. -try: - require( "Whoosh" ) +require( "Whoosh" ) - from whoosh.filedb.filestore import RamStorage - from whoosh.fields import Schema, STORED, ID, KEYWORD, TEXT - from whoosh.index import Index - from whoosh.scoring import BM25F - from whoosh.qparser import MultifieldParser - tool_search_enabled = True - schema = Schema( id = STORED, title = TEXT, description = TEXT, help = TEXT ) -except ImportError, e: - tool_search_enabled = False - schema = None +from whoosh.filedb.filestore import RamStorage +from whoosh.fields import Schema, STORED, ID, KEYWORD, TEXT +from whoosh.index import Index +from whoosh.scoring import BM25F +from whoosh.qparser import MultifieldParser +schema = Schema( id = STORED, title = TEXT, description = TEXT, help = TEXT ) class ToolBoxSearch( object ): """ @@ -26,9 +20,7 @@ Create a searcher for `toolbox`. """ self.toolbox = toolbox - self.enabled = tool_search_enabled - if tool_search_enabled: - self.build_index() + self.build_index() def build_index( self ): self.storage = RamStorage() @@ -40,13 +32,11 @@ writer.commit() def search( self, query, return_attribute='id' ): - if not tool_search_enabled: - return [] # Change field boosts for searcher to place more weight on title, description than help. searcher = self.index.searcher( \ weighting=BM25F( field_B={ 'title_B' : 3, 'description_B' : 2, 'help_B' : 1 } \ ) ) # Set query to search title, description, and help. parser = MultifieldParser( [ 'title', 'description', 'help' ], schema = schema ) - results = searcher.search( parser.parse( query ), minscore=2.0 ) + results = searcher.search( parser.parse( query ) ) return [ result[ return_attribute ] for result in results ] Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.