opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed the must_include_tools filter from the repository revisions API controller, since repository_metadata now has a flag includes_tools.

Browse Source
This commit is contained in:
Dave Bouvier
2013-03-05 10:23:55 -05:00
parent 4dc0ae6cc8
commit 6bc5251965
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/tool_shed/api/repository_revisions.py
+8 -15
View File
@@ -47,27 +47,20 @@ class RepositoryRevisionsController( BaseAPIController ):
do_not_test = kwd.get( 'do_not_test', None )
if do_not_test is not None:
clause_list.append( trans.model.RepositoryMetadata.table.c.do_not_test == util.string_as_bool( do_not_test ) )
# Filter by must_include_tools if received.
must_include_tools = kwd.get( 'must_include_tools', False )
# Filter by includes_tools if received.
includes_tools = kwd.get( 'includes_tools', None )
if includes_tools is not None:
clause_list.append( trans.model.RepositoryMetadata.table.c.includes_tools == util.string_as_bool( includes_tools ) )
try:
query = trans.sa_session.query( trans.app.model.RepositoryMetadata ) \
.filter( and_( *clause_list ) ) \
.order_by( trans.app.model.RepositoryMetadata.table.c.repository_id ) \
.all()
for repository_metadata in query:
if must_include_tools:
metadata = repository_metadata.metadata
if 'tools' in metadata:
ok_to_return = True
else:
ok_to_return = False
else:
ok_to_return = True
if ok_to_return:
item = repository_metadata.get_api_value( view='collection',
value_mapper=default_value_mapper( trans, repository_metadata ) )
item[ 'url' ] = web.url_for( 'repository_revision', id=trans.security.encode_id( repository_metadata.id ) )
rval.append( item )
item = repository_metadata.get_api_value( view='collection',
value_mapper=default_value_mapper( trans, repository_metadata ) )
item[ 'url' ] = web.url_for( 'repository_revision', id=trans.security.encode_id( repository_metadata.id ) )
rval.append( item )
except Exception, e:
rval = "Error in the Tool Shed repository_revisions API in index: " + str( e )
log.error( rval + ": %s" % str( e ) )