From 64bf669fe6cf6fa43e34edd46ea5234ac0f38e55 Mon Sep 17 00:00:00 2001 From: Greg Von Kuster Date: Tue, 18 Dec 2007 14:41:04 +0000 Subject: [PATCH] DataToolParameter should no longer list empty datasets as inputs. --- lib/galaxy/jobs/__init__.py | 1 + lib/galaxy/tools/parameters.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py index 1452ea22223..fcefb09fc29 100644 --- a/lib/galaxy/jobs/__init__.py +++ b/lib/galaxy/jobs/__init__.py @@ -330,6 +330,7 @@ class JobWrapper( object ): dataset.set_meta() dataset.set_peek() else: + dataset.state= model.Dataset.states.EMPTY dataset.blurb = "empty" if stderr: dataset.state = model.Dataset.states.ERROR diff --git a/lib/galaxy/tools/parameters.py b/lib/galaxy/tools/parameters.py index 934a58772cf..96f054c9d5b 100644 --- a/lib/galaxy/tools/parameters.py +++ b/lib/galaxy/tools/parameters.py @@ -699,7 +699,7 @@ class DataToolParameter( ToolParameter ): hid = "%s.%d" % ( parent_hid, i + 1 ) else: hid = str( data.hid ) - if isinstance( data.datatype, self.formats) and not data.deleted and data.state not in [data.states.FAKE, data.states.ERROR]: + if isinstance( data.datatype, self.formats) and not data.deleted and data.state not in [data.states.FAKE, data.states.ERROR, data.states.EMPTY]: selected = ( value and ( data in value ) ) field.add_option( "%s: %s" % ( hid, data.name[:30] ), data.id, selected ) # Also collect children via association object @@ -732,7 +732,7 @@ class DataToolParameter( ToolParameter ): most_recent_dataset = [None] def dataset_collector( datasets ): for i, data in enumerate( datasets ): - if isinstance( data.datatype, self.formats) and not data.deleted and data.state not in [data.states.FAKE, data.states.ERROR]: + if isinstance( data.datatype, self.formats) and not data.deleted and data.state not in [data.states.FAKE, data.states.ERROR, data.states.EMPTY]: most_recent_dataset[0] = data # Also collect children via association object dataset_collector( [ assoc.child for assoc in data.children ] )