| Previous changeset 5:df8b867ab71a (2014-02-07) Next changeset 7:b82d4034e0f8 (2014-02-11) |
|
Commit message:
Deleted selected files |
|
removed:
proteomics_datatypes.diff |
| b |
| diff -r df8b867ab71a -r 1f484bf888ca proteomics_datatypes.diff --- a/proteomics_datatypes.diff Fri Feb 07 09:21:23 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| [ |
| b'@@ -1,209 +0,0 @@\n-diff -r 09b89b345de2 datatypes_conf.xml\n---- a/datatypes_conf.xml\tSun Jun 09 08:16:08 2013 -0500\n-+++ b/datatypes_conf.xml\tFri Feb 07 00:05:57 2014 +0100\n-@@ -2,7 +2,7 @@\n- <datatypes>\n- <datatype_files>\n- <datatype_file name="proteomics.py"/>\n-- </datatype_files>\t\t\n-+ </datatype_files>\n- <registration display_path="display_applications">\n- <datatype extension="prot_gff" type="galaxy.datatypes.proteomics:ProtGff" mimetype="application/xml" display_in_upload="true">\n- <display file="proteomics/ProtGff.xml" />\n-@@ -22,16 +22,22 @@\n- <datatype extension="protxml" type="galaxy.datatypes.proteomics:ProtXML" display_in_upload="true" >\n- <display file="proteomics/ProtXml.xml"/>\n- </datatype>\n-+ <datatype extension="pepxml.tsv" type="galaxy.datatypes.proteomics:PepXmlReport" display_in_upload="true" />\n-+ <datatype extension="protxml.tsv" type="galaxy.datatypes.proteomics:ProtXmlReport" display_in_upload="true" />\n- <datatype extension="mascotdat" type="galaxy.datatypes.proteomics:MascotDat" display_in_upload="false" />\n- <datatype extension="mzml" type="galaxy.datatypes.proteomics:MzML" mimetype="application/xml" display_in_upload="true">\n- <display file="proteomics/mzML.xml"/>\n-+ <display file="proteomics/protvis_mzml.xml"/>\n- </datatype>\n-- <datatype extension="mgf" type="galaxy.datatypes.proteomics:Mgf" display_in_upload="true" />\t\t\n-+ <datatype extension="mgf" type="galaxy.datatypes.proteomics:Mgf" display_in_upload="true" />\n- <datatype extension="xls" type="galaxy.datatypes.proteomics:Xls" display_in_upload="true" />\n- <datatype extension="mzxml" type="galaxy.datatypes.proteomics:MzXML" mimetype="application/xml" display_in_upload="true" />\n- <datatype extension="mzq" type="galaxy.datatypes.proteomics:MzQuantML" mimetype="application/xml" display_in_upload="true" />\n- <datatype extension="mzid" type="galaxy.datatypes.proteomics:MzIdentML" mimetype="application/xml" display_in_upload="true" />\n-- <datatype extension="traML" type="galaxy.datatypes.proteomics:TraML" mimetype="application/xml" display_in_upload="true" />\n-+ <datatype extension="traml" type="galaxy.datatypes.proteomics:TraML" mimetype="application/xml" display_in_upload="true" />\n-+ <datatype extension="featurexml" type="galaxy.datatypes.proteomics:FeatureXML" mimetype="application/xml" display_in_upload="true" />\n-+ <datatype extension="consensusxml" type="galaxy.datatypes.proteomics:ConsensusXML" mimetype="application/xml" display_in_upload="true" />\n-+ <datatype extension="idxml" type="galaxy.datatypes.proteomics:IdXML" mimetype="application/xml" display_in_upload="true" />\n- <datatype extension="raw" type="galaxy.datatypes.proteomics:RAW" display_in_upload="true" />\n- <datatype extension="msp" type="galaxy.datatypes.proteomics:Msp" display_in_upload="true" />\n- <datatype extension="ms2" type="galaxy.datatypes.proteomics:Ms2" display_in_upload="true" />\n-@@ -39,7 +45,7 @@\n- </registration>\n- <sniffers>\n- <sniffer type="galaxy.datatypes.proteomics:ProtGff"/>\n-- <sniffer type="galaxy.datatypes.proteomics:MzML"/> \n-+ <sniffer type="galaxy.datatypes.proteomics:MzML"/>\n- <sniffer type="galaxy.datatypes.proteomics:PepXml"/>\n- <sniffer type="galaxy.datatypes.proteomics:Mgf"/>\n- <sniffer type="galaxy.datatypes.proteomics:ProtXML"/>\n-diff -r 09b89b345de2 proteomics.py\n---- a/proteomics.py\tSun Jun 09 08:16:08 2013 -0500\n-+++ b/proteomics.py\tFri Feb 07 00:05:57 2014 +0100\n-@@ -3,11 +3,13 @@\n- """\n- import logging\n- import re\n-+import binascii\n-+\n- from galaxy.datatypes.data import *\n- from galaxy.datatypes.xml import *\n- from galaxy.datatypes.sniff import *\n- from galaxy.datatypes.binary import *\n--from galaxy.datatypes.interval import *\n-+from galaxy.datatypes.tabular import Tabular\n- \n- log = logging.getLogger(__name__)\n- \n-@@ -53,13 +55,45 @@\n- except:\n- return "Binary xls file (%s)" % ( '..b'lf, dataset ):\n-+ """Returns formated html of peek"""\n-+ return Tabular.make_html_table( self, dataset, column_names=self.column_names )\n-+\n-+ \n-+class ProtXmlReport(Tabular):\n-+ """protxml converted to tabular report"""\n-+ file_ext = "tsv"\n-+ comment_lines = 1\n-+ \n-+ def __init__(self, **kwd):\n-+ Tabular.__init__( self, **kwd )\n-+ self.column_names = ["Entry Number", "Group Probability", "Protein", "Protein Link", "Protein Probability", "Percent Coverage", "Number of Unique Peptides", "Total Independent Spectra", "Percent Share of Spectrum ID\'s", "Description", "Protein Molecular Weight", "Protein Length", "Is Nondegenerate Evidence", "Weight", "Precursor Ion Charge", "Peptide sequence", "Peptide Link", "NSP Adjusted Probability", "Initial Probability", "Number of Total Termini", "Number of Sibling Peptides Bin", "Number of Instances", "Peptide Group Designator", "Is Evidence?"]\n-+\n-+ def display_peek( self, dataset ):\n-+ """Returns formated html of peek"""\n-+ return Tabular.make_html_table( self, dataset, column_names=self.column_names )\n-+\n- class ProteomicsXml(GenericXml):\n- """ An enhanced XML datatype used to reuse code across several\n- proteomic/mass-spec datatypes. """\n- \n- def sniff(self, filename):\n- """ Determines whether the file is the correct XML type. """\n-- with open(filename, \'r\') as contents: \n-+ with open(filename, \'r\') as contents:\n- while True:\n- line = contents.readline()\n- if line == None or not line.startswith(\'<?\'):\n-@@ -81,7 +115,7 @@\n- file_ext = "pepxml"\n- blurb = \'pepXML data\'\n- root = "msms_pipeline_analysis"\n-- \n-+\n- \n- class MzML(ProteomicsXml):\n- """mzML data"""\n-@@ -99,7 +133,7 @@\n- \n- class MzXML(ProteomicsXml):\n- """mzXML data"""\n-- file_ext = "mzXML"\n-+ file_ext = "mzxml"\n- blurb = "mzXML Mass Spectrometry data"\n- root = "mzXML"\n- \n-@@ -108,10 +142,10 @@\n- file_ext = "mzid"\n- blurb = "XML identified peptides and proteins."\n- root = "MzIdentML"\n-- \n-+\n- \n- class TraML(ProteomicsXml):\n-- file_ext = "traML"\n-+ file_ext = "traml"\n- blurb = "TraML transition list"\n- root = "TraML"\n- \n-@@ -121,7 +155,25 @@\n- blurb = "XML quantification data"\n- root = "MzQuantML"\n- \n-- \n-+\n-+class ConsensusXML(ProteomicsXml):\n-+ file_ext = "consensusxml"\n-+ blurb = "OpenMS multiple LC-MS map alignment file"\n-+ root = "consensusXML"\n-+\n-+\n-+class FeatureXML(ProteomicsXml):\n-+ file_ext = "featurexml"\n-+ blurb = "OpenMS feature file"\n-+ root = "featureMap"\n-+\n-+\n-+class IdXML(ProteomicsXml):\n-+ file_ext = "idxml"\n-+ blurb = "OpenMS identification file"\n-+ root = "IdXML"\n-+\n-+\n- class Mgf( Text ):\n- """Mascot Generic Format data"""\n- file_ext = "mgf"\n-@@ -135,7 +187,6 @@\n- dataset.peek = \'file does not exist\'\n- dataset.blurb = \'file purged from disk\'\n- \n--\n- def sniff( self, filename ):\n- mgf_begin_ions = "BEGIN IONS"\n- max_lines=100\n-@@ -146,8 +197,8 @@\n- return True\n- if i>max_lines:\n- return False\n-- \n-- \n-+\n-+\n- class MascotDat( Text ):\n- """Mascot search results """\n- file_ext = "mascotdat"\n-@@ -206,7 +257,7 @@\n- \n- \n- if hasattr(Binary, \'register_sniffable_binary_format\'):\n-- Binary.register_sniffable_binary_format(\'RAW\', \'RAW\', RAW)\n-+ Binary.register_sniffable_binary_format(\'raw\', \'raw\', RAW)\n- \n- \n- class Msp(Text):\n-@@ -267,10 +318,9 @@\n- return True\n- \n- # unsniffable binary format, should do something about this\n--class XHunterAslFormat(Binary):\n-+class XHunterAslFormat( Binary ):\n- """ Annotated Spectra in the HLF format http://www.thegpm.org/HUNTER/format_2006_09_15.html """\n- file_ext = "hlf"\n- \n--\n- if hasattr(Binary, \'register_unsniffable_binary_ext\'):\n- Binary.register_unsniffable_binary_ext(\'hlf\')\n' |