opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9507 from blankenberg/geda-igv

Browse Source 
[20.01] fix for python3 and GEDA, was getting "Connection closed at byte 0"
This commit is contained in:
John Chilton
2020-03-13 13:32:17 -04:00
committed by GitHub
parent 7f2686c5c7 d0acfaf0a1
commit 9ee3ca0b19
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
display_applications/igv/genome_fasta.xml
+2 -2
View File
@@ -70,10 +70,10 @@
</jnlp>
]]>
</param>
<param type="data" name="fai_file" dataset="fasta_file" url="galaxy_${DATASET_HASH}.fasta.fai" format="fai" />
<param type="data" name="fai_file" dataset="fasta_file" url="galaxy_${DATASET_HASH}.${fasta_file.ext}.fai" format="fai" />
<param type="template" name="redirect_url" strip="True" >
#if $site_id.startswith( 'local_' )
${site_link}?genome=${fasta_file.qp}&amp;merge=true&amp;name=name=${qp( ( $fasta_file.name or $DATASET_HASH ).replace( ',', ';' ) )}
${site_link}?genome=${fasta_file.qp}&amp;merge=true&amp;name=${qp( ( $fasta_file.name or $DATASET_HASH ).replace( ',', ';' ) )}
#elif $site_id.startswith( 'web_link_' ):
${site_link}?sessionURL=${fasta_file.qp}&amp;genome=${fasta_file.qp}&amp;merge=true&amp;name=${qp( ( $fasta_file.name or $DATASET_HASH ).replace( ',', ';' ) )}
#else:
lib/galaxy/webapps/galaxy/controllers/dataset.py
+1 -1
View File
@@ -701,7 +701,7 @@ class DatasetInterface(BaseUIController, UsesAnnotations, UsesItemRatings, UsesE
else:
file_name = value.file_name
content_length = os.path.getsize(file_name)
rval = open(file_name)
rval = open(file_name, 'rb')
except OSError as e:
log.debug("Unable to access requested file in display application: %s", e)
return paste.httpexceptions.HTTPNotFound("This file is no longer available.")