On 12 July, 2014 - Miika Turkia wrote:
> Subsurface has saved gas change events without type attribute at some
> point. Thus we need to add the type when reading in log files, if it is
> missing. (Gas change logic relies on the type field nowadays.)
>
> Fixes #617
> Fixes #600
>
> Signed-off-by: Miika Turkia <miika.tur...@gmail.com>
> ---
> parse-xml.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/parse-xml.c b/parse-xml.c
> index 5375e32..606e251 100644
> --- a/parse-xml.c
> +++ b/parse-xml.c
> @@ -1337,6 +1337,12 @@ static void event_end(void)
> pic->offset.seconds = cur_event.time.seconds;
> dive_add_picture(cur_dive, pic);
> } else {
> + /* At some point gas change events did not have
> any type. Thus we need to add
> + * one on import, if we encounter the type one
> missing.
> + */
> + if (cur_event.type == 0 &&
> strcmp(cur_event.name, "gaschange") == 0)
> + cur_event.type = 25;
I would prefer if we used SAMPLE_EVENT_GASCHANGE2 instead of the enum
number.
Are you sure they are of type GASCHANGE2, aka with He? I would guess
they where of type GASCHANGE , aka the ones without any He info.
//Anton
--
Anton Lundin +46702-161604
_______________________________________________
subsurface mailing list
subsurface@hohndel.org
http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
