From c5828aa67c02689060cbb500fb32bf0ca0585f8f Mon Sep 17 00:00:00 2001 From: Jim Johnson Date: Wed, 9 May 2018 08:51:20 -0500 Subject: [PATCH] blib datatype add test file: test.blib include blib version in metadata --- lib/galaxy/datatypes/binary.py | 11 +++++++++++ lib/galaxy/datatypes/test/test.blib | Bin 0 -> 77824 bytes 2 files changed, 11 insertions(+) create mode 100644 lib/galaxy/datatypes/test/test.blib diff --git a/lib/galaxy/datatypes/binary.py b/lib/galaxy/datatypes/binary.py index 54676f66679..7094b4630c8 100644 --- a/lib/galaxy/datatypes/binary.py +++ b/lib/galaxy/datatypes/binary.py @@ -1156,10 +1156,21 @@ class MzSQlite(SQlite): class BlibSQlite(SQlite): """Class describing a Proteomics Spectral Library Sqlite database """ + MetadataElement(name="blib_version", default='1.8', param=MetadataParameter, desc="Blib Version", + readonly=True, visible=True, no_value='1.8') file_ext = "blib" def set_meta(self, dataset, overwrite=True, **kwd): super(BlibSQlite, self).set_meta(dataset, overwrite=overwrite, **kwd) + try: + conn = sqlite.connect(dataset.file_name) + c = conn.cursor() + tables_query = "SELECT majorVersion,minorVersion FROM LibInfo" + result = c.execute(tables_query).fetchall() + (majorVersion,minorVersion) = result = c.execute(tables_query).fetchall()[0] + dataset.metadata.blib_version = '%s.%s' % (majorVersion,minorVersion) + except Exception as e: + log.warning('%s, set_meta Exception: %s', self, e) def sniff(self, filename): if super(BlibSQlite, self).sniff(filename): diff --git a/lib/galaxy/datatypes/test/test.blib b/lib/galaxy/datatypes/test/test.blib new file mode 100644 index 0000000000000000000000000000000000000000..fe43f04e8fe13731fa5ba8169f4c008d33ffc1b4 GIT binary patch literal 77824 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 S5`Y9C0Z0H6_$C2j{r^8-xpX`L literal 0 HcmV?d00001