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

merging from central

Browse Source
This commit is contained in:
Greg Von Kuster
2009-01-22 08:51:48 -05:00
parent b11c63fb44 705994a0fc
commit bb2b948557
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/datatypes/data.py
+10 -4
View File
@@ -131,16 +131,22 @@ class Data( object ):
out = "Can't create peek %s" % str( exc )
return out
def display_name(self, dataset):
"""Returns formated html of dataset name"""
"""Returns formatted html of dataset name"""
try:
return escape(dataset.name)
except:
return "name unavailable"
def display_info(self, dataset):
"""Returns formated html of dataset info"""
"""Returns formatted html of dataset info"""
try:
# Change new line chars to html
return escape( dataset.info ).replace( "\r", "\n" ).replace( "\n", "<br>" )
if dataset.info.find( '\r\n' ) >= 0:
dataset.info = dataset.info.replace( '\r\n', '<br/>' )
if dataset.info.find( '\r' ) >= 0:
dataset.info = dataset.info.replace( '\r', '<br/>' )
if dataset.info.find( '\n' ) >= 0:
dataset.info = dataset.info.replace( '\n', '<br/>' )
return escape( dataset.info )
except:
return "info unavailable"
def validate(self, dataset):
@@ -157,7 +163,7 @@ class Data( object ):
Adds a display app to the datatype.
app_id is a unique id
label is the primary display label, ie display at 'UCSC'
file_function is a string containing the name of the function that returns a properly formated display
file_function is a string containing the name of the function that returns a properly formatted display
links_function is a string containing the name of the function that returns a list of (link_name,link)
"""
self.supported_display_apps = self.supported_display_apps.copy()
tools/data_source/biomart.xml
+1 -1
View File
@@ -7,7 +7,7 @@
TODO: Hack to get biomart to work - the 'add_to_URL' param can be eliminated when the Biomart team encodes URL prior to sending, meanwhile
everything including and beyond the first '&' is truncated from URL. They said they'll let us know when this is fixed at their end.
-->
<tool name="BioMart" id="biomart" tool_type="data_source" URL_method="get">
<tool name="BioMart" id="biomart" tool_type="data_source" URL_method="get" version="1.0.1">
<description>Central server</description>
<command interpreter="python">data_source.py $output</command>
<inputs action="http://www.biomart.org/biomart/martview" check_values="false" method="get" target="_top">
tools/data_source/biomart_test.xml
+1 -1
View File
@@ -7,7 +7,7 @@
TODO: Hack to get biomart to work - the 'add_to_URL' param can be eliminated when the Biomart team encodes URL prior to sending, meanwhile
everything including and beyond the first '&' is truncated from URL. They said they'll let us know when this is fixed at their end.
-->
<tool name="BioMart" id="biomart_test" tool_type="data_source" URL_method="get">
<tool name="BioMart" id="biomart_test" tool_type="data_source" URL_method="get" version="1.0.1">
<description>Test server</description>
<command interpreter="python">data_source.py $output</command>
<inputs action="http://test.biomart.org/biomart/martview" check_values="false" method="get" target="_top">