From: W. Trevor King <wking@drexel.edu>
Date: Mon, 23 Aug 2010 14:29:14 +0000 (-0400)
Subject: Extend JPK v0.5 parsing back to 0.3 and 0.4 file formats.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1c9f3cc24c9a66b5ecc8f10b2155db2f030efb16;p=hooke.git

Extend JPK v0.5 parsing back to 0.3 and 0.4 file formats.

On Mon, Aug 23, 2010 at 02:15:08PM +0200, Michael Haggerty wrote:
> The fundamentals of our file format has not changed much since it was
> introduced.  Most of the changes involve metadata, such as how we
> describe force spectroscopy scanning patterns, that are not even
> described in the document that I sent you.
---

diff --git a/hooke/driver/jpk.py b/hooke/driver/jpk.py
index 6c95fe9..3cbe1df 100644
--- a/hooke/driver/jpk.py
+++ b/hooke/driver/jpk.py
@@ -75,7 +75,7 @@ class JPKDriver (Driver):
             for i in range(len([p for p in f.namelist()
                                 if p.endswith('segment-header.properties')])):
                 segments.append(self._zip_segment(f, path, info, zip_info, i))
-        if zip_info['file-format-version'] not in ['0.5']:
+        if zip_info['file-format-version'] not in ['0.3', '0.4', '0.5']:
             raise NotImplementedError(
                 'JPK file version %s not supported (yet).'
                 % zip_info['file-format-version'])