1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/90a97c6aee95/
changeset: r4972:90a97c6aee95
user: jgoecks
date: 2011-02-01 19:32:02
summary: Parse custom build len files using tabs rather than all whitespace; this matches the output produced by the tool 'Compute Sequence Length'
affected #: 2 files (132 bytes)
--- a/lib/galaxy/web/controllers/tracks.py Tue Feb 01 13:20:18 2011 -0500
+++ b/lib/galaxy/web/controllers/tracks.py Tue Feb 01 13:32:02 2011 -0500
@@ -313,8 +313,9 @@
for line in open( len_file ):
if line.startswith("#"):
continue
- # LEN files are just whitespace separated
- fields = line.split()
+ # LEN files have format:
+ # <chrom_name><tab><chrom_length>
+ fields = line.split("\t")
manifest[fields[0]] = int(fields[1])
return manifest
--- a/lib/galaxy/web/controllers/user.py Tue Feb 01 13:20:18 2011 -0500
+++ b/lib/galaxy/web/controllers/user.py Tue Feb 01 13:32:02 2011 -0500
@@ -1275,8 +1275,10 @@
counter = 0
f = open(new_len.file_name, "w")
+ # LEN files have format:
+ # <chrom_name><tab><chrom_length>
for line in len_text.split("\n"):
- lst = line.strip().split()
+ lst = line.strip().split("\t")
if not lst or len(lst) < 2:
lines_skipped += 1
continue
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/7d19d6962076/
changeset: r4971:7d19d6962076
user: greg
date: 2011-02-01 19:20:18
summary: Fix Manage your API keys link on the user preferences page.
affected #: 1 file (18 bytes)
--- a/templates/user/index.mako Tue Feb 01 13:11:24 2011 -0500
+++ b/templates/user/index.mako Tue Feb 01 13:20:18 2011 -0500
@@ -13,7 +13,7 @@
<li><a href="${h.url_for( controller='user', action='show_info' )}">${_('Manage your information')}</a></li><li><a href="${h.url_for( controller='user', action='set_default_permissions' )}">${_('Change default permissions')}</a> for new histories</li>
%if trans.app.config.enable_api:
- <li><a href="${h.url_for( controller='user', action='api_keys' )}">${_('Manage your API Keys')}</a> for new histories</li>
+ <li><a href="${h.url_for( controller='user', action='api_keys' )}">${_('Manage your API keys')}</a></li>
%endif
%if trans.app.config.enable_openid:
<li><a href="${h.url_for( controller='user', action='openid_manage' )}">${ ('Manage OpenIDs')}</a> linked to your account</li>
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/5297d8f24693/
changeset: r4970:5297d8f24693
user: greg
date: 2011-02-01 19:11:24
summary: Brad Chapman's patch for fixing an issue where the current user roles were not passed to a template.
affected #: 2 files (114 bytes)
--- a/lib/galaxy/web/controllers/library.py Tue Feb 01 11:21:41 2011 -0500
+++ b/lib/galaxy/web/controllers/library.py Tue Feb 01 13:11:24 2011 -0500
@@ -110,6 +110,7 @@
search_term=search_term,
comptypes=comptypes,
lddas=lddas,
+ current_user_roles=trans.get_current_user_roles(),
show_deleted=show_deleted,
use_panels=use_panels,
message=message,
--- a/scripts/data_libraries/build_lucene_index.py Tue Feb 01 11:21:41 2011 -0500
+++ b/scripts/data_libraries/build_lucene_index.py Tue Feb 01 13:11:24 2011 -0500
@@ -61,7 +61,7 @@
fname = ""
else:
fname = ldda.dataset.get_file_name()
- yield ldda.id, fname, _get_dataset_metadata(ldda)
+ yield ldda.id, fname, _get_dataset_metadata(ldda).replace("\n", " ")
def _get_dataset_metadata(ldda):
"""Retrieve descriptions and information associated with a dataset.
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.