[PATCH] DM4 import pressure detection fix

Miika Turkia miika.turkia at gmail.com
Wed Mar 6 20:40:28 PST 2013


Seems that the database can contain either null or empty string when
there is no pressure data available. Changing the pressureblob
validation to reflect this new information.

Since the temperature profile is binary data, we most likely should
accept 0 as a valid value. My samples have null in this blob if there is
no data so it seems to be different than the pressure blob. But of
course there are no guarantees...

Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
 parse-xml.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parse-xml.c b/parse-xml.c
index 80a1244..6c63937 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -1687,9 +1687,9 @@ extern int dm4_dive(void *param, int columns, char **data, char **column)
 		else
 			cur_sample->depth.mm = cur_dive->maxdepth.mm;
 
-		if (tempBlob && tempBlob[i])
+		if (tempBlob)
 			cur_sample->temperature.mkelvin = (tempBlob[i] + 273.15) * 1000;
-		if (pressureBlob)
+		if (data[19] && data[19][0])
 			cur_sample->cylinderpressure.mbar = pressureBlob[i] ;
 		sample_end();
 	}
-- 
1.7.9.5



More information about the subsurface mailing list