details:
http://www.bx.psu.edu/hg/galaxy/rev/6e88248dcc84
changeset: 1723:6e88248dcc84
user: Dan Blankenberg <dan(a)bx.psu.edu>
date: Mon Jan 26 14:48:45 2009 -0500
description:
Fix For MAF Filter tool.
Looks like when grouping parameter types were updated to be recursively wrapped properly,
this tool was not updated.
1 file(s) affected in this change:
tools/maf/maf_filter.xml
diffs (32 lines):
diff -r 2a81c4b95e20 -r 6e88248dcc84 tools/maf/maf_filter.xml
--- a/tools/maf/maf_filter.xml Mon Jan 26 14:41:00 2009 -0500
+++ b/tools/maf/maf_filter.xml Mon Jan 26 14:48:45 2009 -0500
@@ -104,22 +104,22 @@
#if $len( $maf_filter['species1_attributes']['filter_condition'] ) == 0:
#continue
#end if
- primary_component = maf_block.get_component_by_src_start(
"""$maf_filter['species1'].encode( 'string_escape'
)""".decode( 'string_escape' ) )
+ primary_component = maf_block.get_component_by_src_start(
"""$maf_filter['species1'].value.encode( 'string_escape'
)""".decode( 'string_escape' ) )
if primary_component is not None:
#if $maf_filter['species1_attributes']['species1_attribute_type'] ==
'attribute_chr':
- if primary_component.src.split( "." )[-1] $is_isnot_valid.get(
$maf_filter['species1_attributes']['species1_is_isnot'].strip(), 'is
in' )
"""$maf_filter['species1_attributes']['species1_attribute'].encode(
'string_escape' )""".decode( 'string_escape' ).split(
"," ):
+ if primary_component.src.split( "." )[-1] $is_isnot_valid.get(
$maf_filter['species1_attributes']['species1_is_isnot'].value.strip(),
'is in' )
"""$maf_filter['species1_attributes']['species1_attribute'].value.encode(
'string_escape' )""".decode( 'string_escape' ).split(
"," ):
#else
- if primary_component.strand $is_isnot_valid.get(
$maf_filter['species1_attributes']['species1_is_isnot'].strip(),
'==' )
"""$maf_filter['species1_attributes']['species1_attribute'].encode(
'string_escape' )""".decode( 'string_escape' ):
+ if primary_component.strand $is_isnot_valid.get(
$maf_filter['species1_attributes']['species1_is_isnot'].value.strip(),
'==' )
"""$maf_filter['species1_attributes']['species1_attribute'].value.encode(
'string_escape' )""".decode( 'string_escape' ):
#end if
#for $filter_condition in
$maf_filter['species1_attributes']['filter_condition']:
- secondary_component = maf_block.get_component_by_src_start(
"""$filter_condition['species2'].encode( 'string_escape'
)""".decode( 'string_escape' ) )
+ secondary_component = maf_block.get_component_by_src_start(
"""$filter_condition['species2'].value.encode(
'string_escape' )""".decode( 'string_escape' ) )
#if $filter_condition['species2_attributes']['species2_attribute_type']
== 'attribute_chr':
if secondary_component is not None:
- if not ( secondary_component.src.split( "." )[-1]
$is_isnot_valid.get(
$filter_condition['species2_attributes']['species2_is_isnot'].strip(),
'is in' )
"""$filter_condition['species2_attributes']['species2_attribute'].encode(
'string_escape' )""".decode( 'string_escape' ).split(
"," ) ):
+ if not ( secondary_component.src.split( "." )[-1]
$is_isnot_valid.get(
$filter_condition['species2_attributes']['species2_is_isnot'].value.strip(),
'is in' )
"""$filter_condition['species2_attributes']['species2_attribute'].value.encode(
'string_escape' )""".decode( 'string_escape' ).split(
"," ) ):
return False
#else:
if secondary_component is not None:
- if not ( secondary_component.strand $is_isnot_valid.get(
$filter_condition['species2_attributes']['species2_is_isnot'].strip(),
'==' )
"""$filter_condition['species2_attributes']['species2_attribute'].encode(
'string_escape' )""".decode( 'string_escape' ) ):
+ if not ( secondary_component.strand $is_isnot_valid.get(
$filter_condition['species2_attributes']['species2_is_isnot'].value.strip(),
'==' )
"""$filter_condition['species2_attributes']['species2_attribute'].value.encode(
'string_escape' )""".decode( 'string_escape' ) ):
return False
#end if
#end for