From 0f3f301db486c6b90be9a3ab2edb3bef4fc8160b Mon Sep 17 00:00:00 2001 From: Ian Schenck Date: Wed, 16 May 2007 17:48:06 +0000 Subject: [PATCH] Operations validate metadata column assignments now before tool would run. --- tools/new_operations/operation_filter.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/new_operations/operation_filter.py b/tools/new_operations/operation_filter.py index 83ee1dd9b65..eb2c2128277 100644 --- a/tools/new_operations/operation_filter.py +++ b/tools/new_operations/operation_filter.py @@ -15,9 +15,19 @@ def validate_input( trans, error_map, param_values, page_param_map ): data_params = 0 for name, param in page_param_map.iteritems(): if isinstance( param, DataToolParameter ): + # for each dataset parameter if param_values.get(name, None) != None: dbkeys.add( param_values[name].dbkey ) data_params += 1 + # check meta data + try: + param = param_values[name] + startCol = int( param.metadata.startCol ) + endCol = int( param.metadata.endCol ) + chromCol = int( param.metadata.chromCol ) + strandCol = int ( param.metadata.strandCol ) + except: + error_map[name] = "The attributes of this dataset are not the correct format." data_param_names.add( name ) if len( dbkeys ) > 1: for name in data_param_names: @@ -25,7 +35,8 @@ def validate_input( trans, error_map, param_values, page_param_map ): "this dataset is linked to build '%s'" % param_values[name].dbkey if data_params != len(data_param_names): for name in data_param_names: - error_map[name] = "A data of the appropriate type is required" + error_map[name] = "A dataset of the appropriate type is required" + def exec_after_process(app, inp_data, out_data, param_dict, tool=None, stdout=None, stderr=None): """Verify the output data after each run"""