Fix for generated primary file when uploading composite files. Remove missing_meta method from Rgenetics type, it will inherit from data.Text though image.Html.

This commit is contained in:
Daniel Blankenberg
2010-03-09 11:18:45 -05:00
parent 4b548fa0c2
commit 00ce252173
2 changed files with 1 additions and 7 deletions
-6
View File
@@ -275,12 +275,6 @@ class Rgenetics(Html):
allow_datatype_change = False
file_ext = 'rgenetics'
def missing_meta( self, dataset=None, **kwargs):
"""Checks for empty meta values"""
for key, value in dataset.metadata.items():
if not value:
return True
return False
def generate_primary_file( self, dataset = None ):
rval = ['<html><head><title>Rgenetics Galaxy Composite Dataset </title></head><p/>']
rval.append('<div>This composite dataset is composed of the following files:<p/><ul>')
+1 -1
View File
@@ -288,7 +288,7 @@ class UploadDataset( Group ):
dataset_info = None
if dataset.datatype.composite_type == 'auto_primary_file':
#replace sniff here with just creating an empty file
temp_name, is_multi_byte = sniff.stream_to_file( StringIO.StringIO( d_type.generate_primary_file() ), prefix='upload_auto_primary_file' )
temp_name, is_multi_byte = sniff.stream_to_file( StringIO.StringIO( d_type.generate_primary_file( dataset ) ), prefix='upload_auto_primary_file' )
dataset.primary_file = temp_name
dataset.space_to_tab = False
dataset.precreated_name = dataset.name = 'Uploaded Composite Dataset (%s)' % ( file_type )