- galaxy-commits - lists.galaxyproject.org

galaxy-dist commit 7de1adaf5628: Add SAM indel filter tool to tool_conf.xml.sample
by commits-noreply＠bitbucket.org 08 Jun '10

08 Jun '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Kelly Vincent <kpvincent(a)bx.psu.edu> # Date 1275939020 14400 # Node ID 7de1adaf5628e04e2da0d948f03d08cb5ce5d7f3 # Parent 5ba6a1d980ac4d446478d8a4d054234d6342a979 Add SAM indel filter tool to tool_conf.xml.sample --- a/tool_conf.xml.sample +++ b/tool_conf.xml.sample @@ -253,6 +253,7 @@ </section><section name="NGS: SAM Tools" id="samtools"><tool file="samtools/sam_bitwise_flag_filter.xml" /> + <tool file="samtools/sam_indel_filter.xml" /><tool file="samtools/sam2interval.xml" /><tool file="samtools/sam_to_bam.xml" /><tool file="samtools/sam_merge.xml" />

1 0

galaxy-dist commit 5ba6a1d980ac: merged SAM indel filter tool commit
by commits-noreply＠bitbucket.org 08 Jun '10

08 Jun '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Kelly Vincent <kpvincent(a)bx.psu.edu> # Date 1275938865 14400 # Node ID 5ba6a1d980ac4d446478d8a4d054234d6342a979 # Parent 1ab9d6b0ddfc65bc6e58c77891c57ef99e1e12cb # Parent c3ced3ed4fee6e0bdb5acbc7bdc2518995f97e7a merged SAM indel filter tool commit

1 0

galaxy-dist commit c3ced3ed4fee: Adding SAM indel filter tool with test files
by commits-noreply＠bitbucket.org 08 Jun '10

08 Jun '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Kelly Vincent <kpvincent(a)bx.psu.edu> # Date 1275938612 14400 # Node ID c3ced3ed4fee6e0bdb5acbc7bdc2518995f97e7a # Parent f7cf88978f1f848b97c5da1bfe6e48aeb1930378 Adding SAM indel filter tool with test files --- /dev/null +++ b/test-data/sam_indel_filter_out1.sam @@ -0,0 +1,3 @@ +1378_28_770 89 chr11.nib:1-134452384 72131356 37 17M1I5M = 72131356 0 CACACTGTGACAGACAGCGCAGC 00/02!!0//1200210AA44/1 XT:A:U CM:i:2 SM:i:37 AM:i:0 X0:i:1 X1:i:0 XM:i:1 XO:i:1 XG:i:1 MD:Z:22 +1378_69_800 16 chr11.nib:1-125234658 241 255 15M1D8M * 0 0 CGTGGCCGGCGGGCCGAAGGCAT IIIIIIIIIICCCCIII?IIIII +1378_72_1612 151 chrY.nib:1-124295114 190342418 37 19M1I3M = 190342418 0 TCTAACTTAGCCTCATAATAGCT /<<!"0/4//7//00/BC0121/ XT:A:U CM:i:2 SM:i:37 AM:i:0 X0:i:1 X1:i:0 XM:i:1 XO:i:1 XG:i:1 MD:Z:22 --- /dev/null +++ b/tools/samtools/sam_indel_filter.xml @@ -0,0 +1,74 @@ +<tool id="sam_indel_filter" name="Filter SAM" version="1.0.0"> + <description>for indels</description> + <command interpreter="python"> + sam_indel_filter.py + --input=$input1 + --quality_threshold=$quality_threshold + --adjacent_bases=$adjacent_bases + --output=$out_file1 + </command> + <inputs> + <param format="sam" name="input1" type="data" label="Select dataset to filter" /> + <param name="quality_threshold" type="integer" value="40" label="Quality threshold for adjacent bases" help="You need to give the true value, not offset (see chart below), regardless of source FASTQ type" /> + <param name="adjacent_bases" type="integer" value="5" label="The number of adjacent bases to match on either side of the indel" help="If one side is shorter than this width, it will still match if the long-enough side matches" /> + </inputs> + <outputs> + <data format="sam" name="out_file1" /> + </outputs> + <tests> + <test> + <param name="input1" value="sam_indel_filter_in1.sam" ftype="sam"/> + <param name="quality_threshold" value="47"/> + <param name="adjacent_bases" value="2"/> + <output name="out_file1" file="sam_indel_filter_out1.sam" ftype="sam"/> + </test> + <test> + <param name="input1" value="sam_indel_filter_in1.sam" ftype="sam"/> + <param name="quality_threshold" value="62"/> + <param name="adjacent_bases" value="5"/> + <output name="out_file1" file="sam_indel_filter_out2.sam" ftype="sam"/> + </test> + </tests> + <help> + +**What it does** + +Allows extracting indels from SAM. Currently it can handle SAM with alignments with only one insertion or one deletion, and will throw an error if it encounters an alignment with more than one. It matches CIGAR strings (column 6 in the SAM file) like 5M3I5M or 4M2D10M, so there must be a match or mismatch of sufficient length on either side of the indel. + +----- + +**Example** + +Suppose you have the following:: + + r770 89 ref 116 37 17M1I5M = 72131356 0 CACACTGTGACAGACAGCGCAGC 00/02!!0//1200210AA44/1 XT:A:U CM:i:2 SM:i:37 AM:i:0 X0:i:1 X1:i:0 XM:i:1 XO:i:1 XG:i:1 MD:Z:22 + r770 181 ref 116 0 24M = 72131356 0 TTGGTGCGCGCGGTTGAGGGTTGG $$(#%%#$%#%####$%%##$### + r1945 113 ref 181247988 0 23M 41710908 41710908 0 GAGAGAGAGAGAGAGAGAGAGAG PQRVUMNXYRPUXYXWXSOSZ]M XT:A:R CM:i:0 SM:i:0 AM:i:0 X0:i:163148 XM:i:0 XO:i:0 XG:i:0 MD:Z:23 + r1945 177 ref 41710908 0 23M 190342418 181247988 0 AGAGAGAGAGAGAGAGAGAGAGA SQQWZYURVYWX]]YXTSY]]ZM XT:A:R CM:i:0 SM:i:0 AM:i:0 X0:i:163148 XM:i:0 XO:i:0 XG:i:0 MD:Z:23 + r2363 115 ref 19671878 0 23M = 19671877 -1 AGAGAGAGAGAGAGAGAGAGTCT 77543:<55#"4!&=964518A> XT:A:R CM:i:2 SM:i:0 AM:i:0 X0:i:4 X1:i:137 XM:i:2 XO:i:0 XG:i:0 MD:Z:23 + r2363 179 ref 19671877 0 23M = 19671878 1 GAGAGAGAGAGAGAGAGAGAGTC LE7402DD34FL:27AKE>;432 XT:A:R CM:i:0 SM:i:0 AM:i:0 X0:i:265 XM:i:0 XO:i:0 XG:i:0 MD:Z:23 + r3671 117 ref 190342418 0 24M = 190342418 0 CTGGCGTTCTCGGCGTGGATGGGT #####$$##$#%#%%###%$#$## + r3671 153 ref 190342418 37 16M1I6M = 190342418 0 TCTAACTTAGCCTCATAATAGCT /<<!"0///////00/!!0121/ XT:A:U CM:i:2 SM:i:37 AM:i:0 X0:i:1 X1:i:0 XM:i:1 XO:i:1 XG:i:1 MD:Z:22 + r3824 117 ref 80324999 0 24M = 80324999 0 TCCAGTCGCGTTGTTAGGTTCGGA #$#$$$#####%##%%###**#+/ + r3824 153 ref 80324999 37 8M1I14M = 80324999 0 TTTAGCCCGAAATGCCTAGAGCA 4;6//11!"11100110////00 XT:A:U CM:i:2 SM:i:37 AM:i:0 X0:i:1 X1:i:0 XM:i:1 XO:i:1 XG:i:1 MD:Z:22 + r4795 81 ref 26739130 0 23M 57401793 57401793 0 TGGCATTCCTGTAGGCAGAGAGG AZWWZS]!"QNXZ]VQ]]]/2]] XT:A:R CM:i:2 SM:i:0 AM:i:0 X0:i:3 X1:i:0 XM:i:2 XO:i:0 XG:i:0 MD:Z:23 + r4795 161 ref 57401793 37 23M 26739130 26739130 0 GATCACCCAGGTGATGTAACTCC ]WV]]]]WW]]]]]]]]]]PU]] XT:A:U CM:i:0 SM:i:37 AM:i:0 X0:i:1 X1:i:0 XM:i:0 XO:i:0 XG:i:0 MD:Z:23 + r4800 16 ref 241 255 15M1D8M * 0 0 CGTGGCCGGCGGGCCGAAGGCAT IIIIIIIIIICCCCIII?IIIII + r5377 170 ref 59090793 37 23M 26739130 26739130 0 TATCAATAAGGTGATGTAACTCG ]WV]ABAWW]]]]]P]P//GU]] XT:A:U CM:i:0 SM:i:37 AM:i:0 X0:i:1 X1:i:0 XM:i:0 XO:i:0 XG:i:0 MD:Z:23 + r5612 151 ref 190342418 37 19M1I3M = 190342418 0 TCTAACTTAGCCTCATAATAGCT /<<!"0/4//7//00/BC0121/ XT:A:U CM:i:2 SM:i:37 AM:i:0 X0:i:1 X1:i:0 XM:i:1 XO:i:1 XG:i:1 MD:Z:22 + + +To select only alignments with indels, you need to determine the minimum quality you want the adjacent bases to have, as well as the number of adjacent bases to check. If you set the quality threshold to 47 and the number of bases to check to 2, you will get the following output:: + + r770 89 ref 116 37 17M1I5M = 72131356 0 CACACTGTGACAGACAGCGCAGC 00/02!!0//1200210AA44/1 XT:A:U CM:i:2 SM:i:37 AM:i:0 X0:i:1 X1:i:0 XM:i:1 XO:i:1 XG:i:1 MD:Z:22 + r4800 16 ref 241 255 15M1D8M * 0 0 CGTGGCCGGCGGGCCGAAGGCAT IIIIIIIIIICCCCIII?IIIII + r5612 151 ref 190342418 37 19M1I3M = 190342418 0 TCTAACTTAGCCTCATAATAGCT /<<!"0/4//7//00/BC0121/ XT:A:U CM:i:2 SM:i:37 AM:i:0 X0:i:1 X1:i:0 XM:i:1 XO:i:1 XG:i:1 MD:Z:22 + + +For more information on SAM, please consult the `SAM format description`__. + +.. __: http://www.ncbi.nlm.nih.gov/pubmed/19505943 + + + </help> +</tool> --- /dev/null +++ b/tools/samtools/sam_indel_filter.py @@ -0,0 +1,83 @@ +#!/usr/bin/env python + +""" +Allows user to filter out non-indels from SAM. + +usage: %prog [options] + -i, --input=i: Input SAM file to be filtered + -q, --quality_threshold=q: Minimum quality value for adjacent bases + -a, --adjacent_bases=a: Number of adjacent bases on each size to check qualities + -o, --output=o: Filtered output SAM file +""" + +import re, sys +from galaxy import eggs +import pkg_resources; pkg_resources.require( "bx-python" ) +from bx.cookbook import doc_optparse + + +def stop_err( msg ): + sys.stderr.write( '%s\n' % msg ) + sys.exit() + +def __main__(): + #Parse Command Line + options, args = doc_optparse.parse( __doc__ ) + # prep output file + output = open( options.output, 'wb' ) + # patterns + pat_indel = re.compile( '(?P<before_match>(\d+[MIDNSHP])*)(?P<lmatch>\d+)M(?P<ins_del_width>\d+)(?P<ins_del>[ID])(?P<rmatch>\d+)M' ) + pat_matches = re.compile( '\d+[MIDNSHP]' ) + qual_thresh = int( options.quality_threshold ) + adj_bases = int( options.adjacent_bases ) + # go through all lines in input file + for line in open( options.input, 'rb' ): + if line and not line.startswith( '#' ) and not line.startswith( '@' ) : + split_line = line.split( '\t' ) + cigar = split_line[5] + # find all possible matches, like 3M2D7M and 7M3I10M in 3M2D7M3I10M + cigar_copy = cigar[:] + matches = [] + while len( cigar_copy ) >= 6: # nMnInM or nMnDnM + m = pat_indel.match( cigar_copy ) + if not m: + break + else: + parts = m.groupdict() + parts[ 'start' ] = m.start() + matches.append( parts ) + cigar_copy = cigar_copy[ len( parts[ 'lmatch' ] ) : ] + # see if matches meet filter requirements + if len( matches ) == 1: + start = int( matches[0][ 'start' ] ) + left = int( matches[0][ 'lmatch' ] ) + right = int( matches[0][ 'rmatch' ] ) + if matches[0][ 'ins_del' ] == 'D': + middle = int( matches[0][ 'ins_del_width' ] ) + else: + middle = 0 + # if there are enough adjacent bases to check, then do so + if left >= adj_bases and right >= adj_bases: + qual = split_line[10] + left_bases = qual[ start : start + left + 1 ][ -adj_bases : ] + right_bases = qual[ start + left + middle : start + left + middle + right + 1 ][ : adj_bases ] + qual_thresh_met = True + for l in left_bases: + if ord( l ) < qual_thresh: + qual_thresh_met = False + break + if qual_thresh_met: + for r in right_bases: + if ord( r ) < qual_thresh: + qual_thresh_met = False + break + # if filter reqs met, output line + if qual_thresh_met: + output.write( line ) + # error if there are multiple indels + elif len( matches ) > 1: + stop_err( 'There is more than one indel present in the alignment:\n%s' % line ) + # close out file + output.close() + +if __name__=="__main__": __main__() --- /dev/null +++ b/test-data/sam_indel_filter_out2.sam @@ -0,0 +1,1 @@ +1378_69_800 16 chr11.nib:1-125234658 241 255 15M1D8M * 0 0 CGTGGCCGGCGGGCCGAAGGCAT IIIIIIIIIICCCCIII?IIIII --- /dev/null +++ b/test-data/sam_indel_filter_in1.sam @@ -0,0 +1,15 @@ +1378_28_770 89 chr11.nib:1-134452384 72131356 37 17M1I5M = 72131356 0 CACACTGTGACAGACAGCGCAGC 00/02!!0//1200210AA44/1 XT:A:U CM:i:2 SM:i:37 AM:i:0 X0:i:1 X1:i:0 XM:i:1 XO:i:1 XG:i:1 MD:Z:22 +1378_28_770 181 chr11.nib:1-134452384 72131356 0 24M = 72131356 0 TTGGTGCGCGCGGTTGAGGGTTGG $$(#%%#$%#%####$%%##$### +1378_33_1945 113 chr2.nib:1-242951149 181247988 0 23M chr12.nib:1-132349534 41710908 0 GAGAGAGAGAGAGAGAGAGAGAG PQRVUMNXYRPUXYXWXSOSZ]M XT:A:R CM:i:0 SM:i:0 AM:i:0 X0:i:163148 XM:i:0 XO:i:0 XG:i:0 MD:Z:23 +1378_33_1945 177 chr12.nib:1-132349534 41710908 0 23M chr2.nib:1-242951149 181247988 0 AGAGAGAGAGAGAGAGAGAGAGA SQQWZYURVYWX]]YXTSY]]ZM XT:A:R CM:i:0 SM:i:0 AM:i:0 X0:i:163148 XM:i:0 XO:i:0 XG:i:0 MD:Z:23 +1378_35_263 115 chr16.nib:1-88827254 19671878 0 23M = 19671877 -1 AGAGAGAGAGAGAGAGAGAGTCT 77543:<55#"4!&=964518A> XT:A:R CM:i:2 SM:i:0 AM:i:0 X0:i:4 X1:i:137 XM:i:2 XO:i:0 XG:i:0 MD:Z:23 +1378_35_263 179 chr16.nib:1-88827254 19671877 0 23M = 19671878 1 GAGAGAGAGAGAGAGAGAGAGTC LE7402DD34FL:27AKE>;432 XT:A:R CM:i:0 SM:i:0 AM:i:0 X0:i:265 XM:i:0 XO:i:0 XG:i:0 MD:Z:23 +1378_51_1671 117 chr2.nib:1-242951149 190342418 0 24M = 190342418 0 CTGGCGTTCTCGGCGTGGATGGGT #####$$##$#%#%%###%$#$## +1378_51_1671 153 chr2.nib:1-242951149 190342418 37 16M1I6M = 190342418 0 TCTAACTTAGCCTCATAATAGCT /<<!"0///////00/!!0121/ XT:A:U CM:i:2 SM:i:37 AM:i:0 X0:i:1 X1:i:0 XM:i:1 XO:i:1 XG:i:1 MD:Z:22 +1378_56_324 117 chr2.nib:1-242951149 80324999 0 24M = 80324999 0 TCCAGTCGCGTTGTTAGGTTCGGA #$#$$$#####%##%%###**#+/ +1378_56_324 153 chr2.nib:1-242951149 80324999 37 8M1I14M = 80324999 0 TTTAGCCCGAAATGCCTAGAGCA 4;6//11!"11100110////00 XT:A:U CM:i:2 SM:i:37 AM:i:0 X0:i:1 X1:i:0 XM:i:1 XO:i:1 XG:i:1 MD:Z:22 +1378_67_1795 81 chr16.nib:1-88827254 26739130 0 23M chrY.nib:1-57772954 57401793 0 TGGCATTCCTGTAGGCAGAGAGG AZWWZS]!"QNXZ]VQ]]]/2]] XT:A:R CM:i:2 SM:i:0 AM:i:0 X0:i:3 X1:i:0 XM:i:2 XO:i:0 XG:i:0 MD:Z:23 +1378_67_1795 161 chrY.nib:1-57772954 57401793 37 23M chr16.nib:1-88827254 26739130 0 GATCACCCAGGTGATGTAACTCC ]WV]]]]WW]]]]]]]]]]PU]] XT:A:U CM:i:0 SM:i:37 AM:i:0 X0:i:1 X1:i:0 XM:i:0 XO:i:0 XG:i:0 MD:Z:23 +1378_69_800 16 chr11.nib:1-125234658 241 255 15M1D8M * 0 0 CGTGGCCGGCGGGCCGAAGGCAT IIIIIIIIIICCCCIII?IIIII +1378_69_1777 170 chrX.nib:1-59090954 59090793 37 23M chr16.nib:1-88827254 26739130 0 TATCAATAAGGTGATGTAACTCG ]WV]ABAWW]]]]]P]P//GU]] XT:A:U CM:i:0 SM:i:37 AM:i:0 X0:i:1 X1:i:0 XM:i:0 XO:i:0 XG:i:0 MD:Z:23 +1378_72_1612 151 chrY.nib:1-124295114 190342418 37 19M1I3M = 190342418 0 TCTAACTTAGCCTCATAATAGCT /<<!"0/4//7//00/BC0121/ XT:A:U CM:i:2 SM:i:37 AM:i:0 X0:i:1 X1:i:0 XM:i:1 XO:i:1 XG:i:1 MD:Z:22

1 0

galaxy-dist commit f415eee0950c: Being extremely cautious when displaying history atibutes associated with an hda in the library dataset info page.
by commits-noreply＠bitbucket.org 07 Jun '10

07 Jun '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Greg Von Kuster <greg(a)bx.psu.edu> # Date 1275929498 14400 # Node ID f415eee0950c78ccf103bde9d4adc8a853e55a1e # Parent ada54c10540ae10f308a1f2e8683bcbe779057f1 Being extremely cautious when displaying history atibutes associated with an hda in the library dataset info page. --- a/templates/library/common/ldda_info.mako +++ b/templates/library/common/ldda_info.mako @@ -148,12 +148,21 @@ </thead> %for hda in associated_hdas: <tr> - <td><a target="_blank" href="${h.url_for( controller='history', action='view', id=trans.security.encode_id( hda.history_id ) )}">${hda.history.get_display_name()}</a></td> + <td> + <% + hda_hist = trans.sa_session.query( trans.model.History ).get( hda.history_id ) + %> + %if hda_hist: + <a target="_blank" href="${h.url_for( controller='history', action='view', id=trans.security.encode_id( hda_hist.id ) )}">${hda_hist.get_display_name()}</a> + %else: + error getting history + %endif + </td><td>${hda.get_display_name()}</td><td>${time_ago( hda.update_time )}</td><td> - %if hda.history.user: - ${hda.history.user.email} + %if hda_hist and hda_hist.user: + ${hda_hist.user.email} %else: anonymous %endif

1 0

galaxy-dist commit ada54c10540a: Bugfix for 4fb747f317d0, open tar file as stream
by commits-noreply＠bitbucket.org 07 Jun '10

07 Jun '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Nate Coraor <nate(a)bx.psu.edu> # Date 1275926267 14400 # Node ID ada54c10540ae10f308a1f2e8683bcbe779057f1 # Parent 1f70816084ae18122f3af9a5efb588f9ace6cd11 Bugfix for 4fb747f317d0, open tar file as stream --- a/lib/galaxy/web/controllers/library_common.py +++ b/lib/galaxy/web/controllers/library_common.py @@ -1382,7 +1382,7 @@ class LibraryCommon( BaseController ): archive.add = lambda x, y: archive.write( x, y.encode('CP437') ) elif action == 'tgz': if trans.app.config.upstream_gzip: - archive = util.streamball.StreamBall( 'w' ) + archive = util.streamball.StreamBall( 'w|' ) outext = 'tar' else: archive = util.streamball.StreamBall( 'w|gz' )

1 0

galaxy-dist commit 1ab9d6b0ddfc: Yet another fix fo creating the history link on the library dataset information page - since it is possible to have an hda that does not have an associated history, we need to handle it.
by commits-noreply＠bitbucket.org 07 Jun '10

07 Jun '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Greg Von Kuster <greg(a)bx.psu.edu> # Date 1275930847 14400 # Node ID 1ab9d6b0ddfc65bc6e58c77891c57ef99e1e12cb # Parent f415eee0950c78ccf103bde9d4adc8a853e55a1e Yet another fix fo creating the history link on the library dataset information page - since it is possible to have an hda that does not have an associated history, we need to handle it. --- a/templates/library/common/ldda_info.mako +++ b/templates/library/common/ldda_info.mako @@ -149,20 +149,17 @@ %for hda in associated_hdas: <tr><td> - <% - hda_hist = trans.sa_session.query( trans.model.History ).get( hda.history_id ) - %> - %if hda_hist: - <a target="_blank" href="${h.url_for( controller='history', action='view', id=trans.security.encode_id( hda_hist.id ) )}">${hda_hist.get_display_name()}</a> + %if hda.history: + <a target="_blank" href="${h.url_for( controller='history', action='view', id=trans.security.encode_id( hda.history_id ) )}">${hda.history.get_display_name()}</a> %else: - error getting history + no history %endif </td><td>${hda.get_display_name()}</td><td>${time_ago( hda.update_time )}</td><td> - %if hda_hist and hda_hist.user: - ${hda_hist.user.email} + %if hda.history and hda.history.user: + ${hda.history.user.email} %else: anonymous %endif

1 0

galaxy-dist commit 1f70816084ae: Fix bug in 48ec25db21c3
by commits-noreply＠bitbucket.org 07 Jun '10

07 Jun '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Nate Coraor <nate(a)bx.psu.edu> # Date 1275924969 14400 # Node ID 1f70816084ae18122f3af9a5efb588f9ace6cd11 # Parent 2c99bd86765fc2665cfa6bea98b4ebae7fc3d6c8 Fix bug in 48ec25db21c3 --- a/lib/galaxy/web/controllers/page.py +++ b/lib/galaxy/web/controllers/page.py @@ -129,7 +129,7 @@ class HistoryDatasetAssociationSelection model_class = model.HistoryDatasetAssociation columns = [ ItemSelectionGrid.NameColumn( "Name", key="name", model_class=model.HistoryDatasetAssociation, filterable="advanced" ), - grids.IndividualTagsColumn( "Tags", "tags", model_class=model.HistoryDatasetAssociation, model.HistoryDatasetAssociationTagAssociation, filterable="advanced"), + grids.IndividualTagsColumn( "Tags", "tags", model.HistoryDatasetAssociation, model.HistoryDatasetAssociationTagAssociation, filterable="advanced"), grids.GridColumn( "Last Updated", key="update_time", format=time_ago ), # Columns that are valid for filtering but are not visible. grids.DeletedColumn( "Deleted", key="deleted", visible=False, filterable="advanced" ),

1 0

galaxy-dist commit f08dff0dd4ac: Allow disabling of library download compression types
by commits-noreply＠bitbucket.org 07 Jun '10

07 Jun '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Nate Coraor <nate(a)bx.psu.edu> # Date 1275924310 14400 # Node ID f08dff0dd4ac92c5d9b75792c2c5c38eb280e81b # Parent 4fb747f317d0b2c36ffb5fbf4b815caf4cb6ace1 Allow disabling of library download compression types --- a/lib/galaxy/web/controllers/library_common.py +++ b/lib/galaxy/web/controllers/library_common.py @@ -109,6 +109,13 @@ class LibraryCommon( BaseController ): comptypes_t = comptypes if trans.app.config.nginx_x_archive_files_base: comptypes_t = ['ngxzip'] + for comptype in trans.app.config.disable_library_comptypes: + # TODO: do this once, not every time (we're gonna raise an + # exception every time after the first time) + try: + comptypes_t.remove( comptype ) + except: + pass return trans.fill_template( '/library/common/browse_library.mako', cntrller=cntrller, use_panels=use_panels, --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -98,6 +98,7 @@ class Configuration( object ): if self.user_library_import_dir is not None and not os.path.exists( self.user_library_import_dir ): raise ConfigurationError( "user_library_import_dir specified in config (%s) does not exist" % self.user_library_import_dir ) self.allow_library_path_paste = kwargs.get( 'allow_library_path_paste', False ) + self.disable_library_comptypes = kwargs.get( 'disable_library_comptypes', '' ).lower().split( ',' ) # Configuration options for taking advantage of nginx features self.upstream_gzip = string_as_bool( kwargs.get( 'upstream_gzip', False ) ) self.apache_xsendfile = kwargs.get( 'apache_xsendfile', False )

1 0

galaxy-dist commit 48ec25db21c3: Fix model_class typo.
by commits-noreply＠bitbucket.org 07 Jun '10

07 Jun '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User jeremy goecks <jeremy.goecks(a)emory.edu> # Date 1275923167 14400 # Node ID 48ec25db21c3bd76b52bcd68a1301f777eea280e # Parent f47ab71b2df3c27c7d231522c848b5e5ee2d2fe7 Fix model_class typo. --- a/lib/galaxy/web/controllers/page.py +++ b/lib/galaxy/web/controllers/page.py @@ -129,7 +129,7 @@ class HistoryDatasetAssociationSelection model_class = model.HistoryDatasetAssociation columns = [ ItemSelectionGrid.NameColumn( "Name", key="name", model_class=model.HistoryDatasetAssociation, filterable="advanced" ), - grids.IndividualTagsColumn( "Tags", "tags", model.StoredWorkflow, model.HistoryDatasetAssociationTagAssociation, filterable="advanced"), + grids.IndividualTagsColumn( "Tags", "tags", model_class=model.HistoryDatasetAssociation, model.HistoryDatasetAssociationTagAssociation, filterable="advanced"), grids.GridColumn( "Last Updated", key="update_time", format=time_ago ), # Columns that are valid for filtering but are not visible. grids.DeletedColumn( "Deleted", key="deleted", visible=False, filterable="advanced" ),

1 0

galaxy-dist commit 2c99bd86765f: Add RGENETICS section label to main tool conf
by commits-noreply＠bitbucket.org 07 Jun '10

07 Jun '10

# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Nate Coraor <nate(a)bx.psu.edu> # Date 1275924412 14400 # Node ID 2c99bd86765fc2665cfa6bea98b4ebae7fc3d6c8 # Parent f08dff0dd4ac92c5d9b75792c2c5c38eb280e81b Add RGENETICS section label to main tool conf --- a/tool_conf.xml.main +++ b/tool_conf.xml.main @@ -333,6 +333,7 @@ <tool file="genetrack/genetrack_indexer.xml" /><tool file="genetrack/genetrack_peak_prediction.xml" /></section> + <label text="RGENETICS" id="rgenetics" /><section name="SNP/WGA: Data; Filters" id="rgdat"><label text="Data: Import and upload" id="rgimport" /><tool file="data_source/upload.xml"/>

1 0