# HG changeset patch # User iuc # Date 1421354028 18000 # Node ID ba3abde6775bf67866e68db32260ac8c421ac8f2 # Parent ed88ab9ead28f5e158890802974882f986fab1a6 Uploaded diff -r ed88ab9ead28 -r ba3abde6775b gemini_autosomal_recessive.xml --- a/gemini_autosomal_recessive.xml Tue Jan 13 10:07:11 2015 -0500 +++ b/gemini_autosomal_recessive.xml Thu Jan 15 15:33:48 2015 -0500 @@ -21,9 +21,7 @@ --columns "${report.columns}" #end if - #if str($filter.filter_selector) == 'yes': - --filter "${filter.filter}" - #end if + @CMDLN_SQL_FILTER_FILTER_OPTION@ -d $d #if int($min_kindreds) > 0: diff -r ed88ab9ead28 -r ba3abde6775b gemini_comp_hets.xml --- a/gemini_comp_hets.xml Tue Jan 13 10:07:11 2015 -0500 +++ b/gemini_comp_hets.xml Thu Jan 15 15:33:48 2015 -0500 @@ -14,9 +14,8 @@ --columns "${report.columns}" #end if - #if $filter.filter_selector == 'yes': - --filter "${filter.filter}" - #end if + @CMDLN_SQL_FILTER_FILTER_OPTION@ + $only_affected $ignore_phasing diff -r ed88ab9ead28 -r ba3abde6775b gemini_de_novo.xml --- a/gemini_de_novo.xml Tue Jan 13 10:07:11 2015 -0500 +++ b/gemini_de_novo.xml Thu Jan 15 15:33:48 2015 -0500 @@ -14,9 +14,8 @@ --columns "${report.columns}" #end if - #if $filter.filter_selector == 'yes': - --filter "${filter.filter}" - #end if + @CMDLN_SQL_FILTER_FILTER_OPTION@ + -d $d "${ infile }" > "${ outfile }" diff -r ed88ab9ead28 -r ba3abde6775b gemini_macros.xml --- a/gemini_macros.xml Tue Jan 13 10:07:11 2015 -0500 +++ b/gemini_macros.xml Thu Jan 15 15:33:48 2015 -0500 @@ -88,11 +88,17 @@ - - + + + #if str($filter.filter_selector) == 'yes' and $filter.filter: + #import pipes + --filter ${ pipes.quote( str( $filter.filter ) ) or "''" } + #end if + + diff -r ed88ab9ead28 -r ba3abde6775b gemini_region.xml --- a/gemini_region.xml Tue Jan 13 10:07:11 2015 -0500 +++ b/gemini_region.xml Thu Jan 15 15:33:48 2015 -0500 @@ -24,9 +24,7 @@ --columns "${report.columns}" #end if - #if $filter.filter_selector == 'yes': - --filter "${filter.filter}" - #end if + @CMDLN_SQL_FILTER_FILTER_OPTION@ $header "${ infile }" diff -r ed88ab9ead28 -r ba3abde6775b tool_dependencies.xml --- a/tool_dependencies.xml Tue Jan 13 10:07:11 2015 -0500 +++ b/tool_dependencies.xml Thu Jan 15 15:33:48 2015 -0500 @@ -13,6 +13,6 @@ - +