1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/f1d77cc91367/ Changeset: f1d77cc91367 User: carlfeberhard Date: 2013-10-17 19:14:11 Summary: Graph datatypes: re-add to conf.sample returning False from all sniffers; the user must now manually change the type Affected #: 2 files diff -r 01975234fe5b2ea1058dee188b5032155a43499b -r f1d77cc9136794e0272f2ed9b1b33f976f3a0f10 datatypes_conf.xml.sample --- a/datatypes_conf.xml.sample +++ b/datatypes_conf.xml.sample @@ -245,6 +245,10 @@ <datatype extension="snpmatrix" type="galaxy.datatypes.genetics:SNPMatrix" display_in_upload="true"/><datatype extension="xls" type="galaxy.datatypes.tabular:Tabular"/><!-- End RGenetics Datatypes --> + <!-- graph datatypes --> + <datatype extension="xgmml" type="galaxy.datatypes.graph:Xgmml" display_in_upload="true"/> + <datatype extension="sif" type="galaxy.datatypes.graph:Sif" display_in_upload="true"/> + <datatype extension="rdf" type="galaxy.datatypes.graph:Rdf" display_in_upload="true"/></registration><sniffers><!-- diff -r 01975234fe5b2ea1058dee188b5032155a43499b -r f1d77cc9136794e0272f2ed9b1b33f976f3a0f10 lib/galaxy/datatypes/graph.py --- a/lib/galaxy/datatypes/graph.py +++ b/lib/galaxy/datatypes/graph.py @@ -34,14 +34,9 @@ def sniff( self, filename ): """ - Determines whether the file is XML or not, should probably actually check if it is a real xgmml file.... + Returns false and the user must manually set. """ - line = '' - with open( filename ) as handle: - line = handle.readline() - - #TODO - Is there a more robust way to do this? - return line.startswith( '<?xml ' ) + return False @staticmethod def merge( split_files, output_file ): @@ -85,19 +80,9 @@ def sniff( self, filename ): """ - Determines whether the file is SIF + Returns false and the user must manually set. """ - line = '' - with open( filename ) as infile: - correct = True - for line in infile: - if not line.strip(): - continue - tlen = len( line.split( "\t" ) ) - # may contain 1 or >= 3 columns - if tlen == 2: - correct = False - return correct + return False @staticmethod def merge( split_files, output_file ): @@ -116,6 +101,12 @@ """ file_ext = "rdf" + def sniff( self, filename ): + """ + Returns false and the user must manually set. + """ + return False + def set_peek( self, dataset, is_multi_byte=False ): """Set the peek and blurb text""" if not dataset.dataset.purged: 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.