[PATCH] Fix cylinder pressure for UDDF export

Fixes #1086 Signed-off-by: Miika Turkia --- xslt/uddf-export.xslt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xslt/uddf-export.xslt b/xslt/uddf-export.xslt index 42dbbf0..53e1e84 100644 --- a/xslt/uddf-export.xslt +++ b/xslt/uddf-export.xslt

[PATCH] Count the weights properly on UDDF export

Using node() along with the node-set seems to grab the weights properly for me. Signed-off-by: Miika Turkia miika.tur...@gmail.com --- xslt/uddf-export.xslt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xslt/uddf-export.xslt b/xslt/uddf-export.xslt index

Re: [PATCH 6/7] Lots of minor UDDF export tweaks.

... + leadquantity +xsl:value-of select=sum(xt:node-set($trimmedweightlist))/ + /leadquantity I am testing the UDDF export and don't see any weights exported. Was the /weight removed here intentionally when moving the code around? Adding that to the XSLT

Re: [PATCH 6/7] Lots of minor UDDF export tweaks.

+xsl:value-of select=sum(xt:node-set($trimmedweightlist))/ + /leadquantity I am testing the UDDF export and don't see any weights exported. Was the /weight removed here intentionally when moving the code around? Adding that to the XSLT does not solve the problem. So do you

Re: [PATCH 4/7] Fix divecomputer part of UDDF export

On 13 December 2014 at 23:33, Long, Martin mar...@longhome.co.uk wrote: I'll have to test this tomorrow hopefully. i've not been able to do anything on this tonight, so hopefully I'll get a chance tomorrow. Am I missing something? I don't see a Subsurface-testing branch in libdivecomputer. I'm

Re: [PATCH 4/7] Fix divecomputer part of UDDF export

On December 14, 2014 1:41:48 PM Long, Martin mar...@longhome.co.uk wrote: On 13 December 2014 at 23:33, Long, Martin mar...@longhome.co.uk wrote: I'll have to test this tomorrow hopefully. i've not been able to do anything on this tonight, so hopefully I'll get a chance tomorrow. Am I

Re: [PATCH 4/7] Fix divecomputer part of UDDF export

On 13 December 2014 at 16:40, Dirk Hohndel d...@hohndel.org wrote: Well, there are divecomputer sections in each dive, but the nickname, serial, firmware, etc, should be stored in the settings at the beginning. And that has been true at least since Subsurface 3. Also, if the nickname is

Re: [PATCH 4/7] Fix divecomputer part of UDDF export

On Sat, Dec 13, 2014 at 04:44:19PM +, Long, Martin wrote: On 13 December 2014 at 16:40, Dirk Hohndel d...@hohndel.org wrote: Well, there are divecomputer sections in each dive, but the nickname, serial, firmware, etc, should be stored in the settings at the beginning. And that has

Re: [PATCH 4/7] Fix divecomputer part of UDDF export

So, the info in every profile (for my Suunto) is: divecomputer model='Suunto Vyper Air' deviceid='cef51609' diveid='8ab03c43' And the details in the settings section, when I add a nickname: divecomputerid model='Suunto Vyper Air' deviceid='cef51609' nickname='nick'/ So, it looks like there

[PATCH 03/10] Grab manually added air temperature on UDDF export

Signed-off-by: Miika Turkia miika.tur...@gmail.com --- xslt/uddf-export.xslt | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/xslt/uddf-export.xslt b/xslt/uddf-export.xslt index 8350986..da44e0a 100644 --- a/xslt/uddf-export.xslt +++ b/xslt/uddf-export.xslt @@

Re: [PATCH 4/7] Fix divecomputer part of UDDF export

On Sat, Dec 13, 2014 at 05:29:06PM +, Long, Martin wrote: So, the info in every profile (for my Suunto) is: divecomputer model='Suunto Vyper Air' deviceid='cef51609' diveid='8ab03c43' And the details in the settings section, when I add a nickname: divecomputerid model='Suunto

Re: [PATCH 4/7] Fix divecomputer part of UDDF export

I'll have to test this tomorrow hopefully. i've not been able to do anything on this tonight, so hopefully I'll get a chance tomorrow. ___ subsurface mailing list subsurface@subsurface-divelog.org

Re: [PATCH 6/7] Lots of minor UDDF export tweaks.

($trimmedweightlist))/ + /leadquantity I am testing the UDDF export and don't see any weights exported. Was the /weight removed here intentionally when moving the code around? Adding that to the XSLT does not solve the problem. So do you have any idea of what is wrong here? miika

[PATCH 3/7] Use generated Ids for site lookup in UDDF export.

As with buddies, sites could contain characters which are not valid in Ids. Also, it is very possible to have duplicate site names. This uses an XSL generated id to prevent any issues. Signed-off-by: Martin Long mar...@longhome.co.uk --- xslt/uddf-export.xslt | 12 ++-- 1 file changed,

[PATCH 5/7] Various minor fixes to UDDF export

Removed underscore from buddy name elements Added 'mix' prefix to gas ids. Ids must not start with a number. Added mandatory profile data with empty tags. Signed-off-by: Martin Long mar...@longhome.co.uk --- xslt/uddf-export.xslt | 20 +++- 1 file changed, 11 insertions(+), 9

[PATCH 4/7] Fix divecomputer part of UDDF export

XPath was incorrect for parsing divecomputers into the equipment section, meaning they dont get inserted. Signed-off-by: Martin Long mar...@longhome.co.uk --- xslt/uddf-export.xslt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xslt/uddf-export.xslt b/xslt/uddf-export.xslt

[PATCH 7/7] Fix bug in tankpressurebegin in UDDF export

There was a bug when the first sample doesn't contain pressure info. This fixes that by selecting the first with pressure info. Signed-off-by: Martin Long mar...@longhome.co.uk --- xslt/uddf-export.xslt | 29 + 1 file changed, 13 insertions(+), 16 deletions(-) diff

[PATCH 1/7] Update UDDF export generator header to include madatory tags.

Add name at generator level, and add additional homepage in contact tag. Signed-off-by: Martin Long mar...@longhome.co.uk --- xslt/uddf-export.xslt | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xslt/uddf-export.xslt b/xslt/uddf-export.xslt index 2f7ba70..7cdb2b2

[PATCH 2/7] Use generated ids for buddies in UDDF export.

This is instead of using their names, which may contain illegal characters. Signed-off-by: Martin Long mar...@longhome.co.uk --- xslt/uddf-export.xslt | 45 - 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/xslt/uddf-export.xslt

UDDF export - nearly there.

So another 7 patches. This makes it almost 100% UDDF 3.2 compliant. I say almost. There are a couple of places where the schema doesn't agree with the documentation, where I believe the schema. I believe there are also some bugs in the schema too. In both cases I'll raise these with the authors.

Re: UDDF export - nearly there.

On Dec 12, 2014, at 4:43 PM, Long, Martin mar...@longhome.co.uk wrote: So another 7 patches. This makes it almost 100% UDDF 3.2 compliant. I say almost. There are a couple of places where the schema doesn't agree with the documentation, where I believe the schema. I believe there are

Re: [PATCH 4/7] Fix divecomputer part of UDDF export

On Sat, Dec 13, 2014 at 2:34 AM, Martin Long mar...@longhome.co.uk wrote: XPath was incorrect for parsing divecomputers into the equipment section, meaning they dont get inserted. Can you elaborate on this one as on my divelog all the dive computers are listed on the settings section and the

UDDF Export

So. I ran the UDDF output through the XSL schema from the uddf site. It looks like there are still lots of areas where we are not compliant. - Lots of areas where there are mandatory tags we need to provide (looks like most of this is static). - Lots of ID which aren't compliant. I think this

Re: UDDF Export

On December 11, 2014 8:07:49 AM Long, Martin mar...@longhome.co.uk wrote: So. I ran the UDDF output through the XSL schema from the uddf site. It looks like there are still lots of areas where we are not compliant. In general I have a dim view of the UDDF format (it's over designed and

[PATCH 2/2] Aggregate multiple weights into UDDF export.

Sum together all of the weights recored on a dive to use in the leadquantity tag in UDDF export. Signed-off-by: Martin Long mar...@longhome.co.uk --- xslt/uddf-export.xslt | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xslt/uddf-export.xslt b/xslt/uddf-export.xslt

[PATCH] Add 'trip' support to UDDF export

Currently repetition groups are used to group dives into trips. This is not really correct. Repetition groups should really represent a group of dives where tissue loading needs to be preserved between dives (typically the same day). UDDF has support for trips, using the divetrip tags. This is a

UDDF Export Format

Hi, I'm currently working on some patches to the UDDF export format, to address a few issues which I'm seeing in the files. For example, I've separated buddies out, and linked to multiply buddies, rather than the current method which is to always link to a single buddy, which may actually

Re: UDDF Export Format

is a bit unfortunate as I'm trying to do a release later this week... if your changes truly only touch the UDDF export then I may be able to add them right before the release, but I'll have to make the call when I see the patches. In order to make my life easier (and increase the likelihood to get

[PATCH 7/7] Fixed airtemperature in UDDF export.

The XSLT didn't expect the temperature tag to be within the divecomputer element in the source, so the selection wasn't finding it. --- xslt/uddf-export.xslt | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/xslt/uddf-export.xslt b/xslt/uddf-export.xslt index

[PATCH 6/7] Added leadquantity to UDDF export, showing weight used.

--- xslt/uddf-export.xslt | 4 1 file changed, 4 insertions(+) diff --git a/xslt/uddf-export.xslt b/xslt/uddf-export.xslt index e558ca5..b4c3cd9 100644 --- a/xslt/uddf-export.xslt +++ b/xslt/uddf-export.xslt @@ -237,6 +237,10 @@ /xsl:attribute /link /xsl:if

[PATCH 5/7] Split last_name and first_name for buddies in UDDF export

--- xslt/uddf-export.xslt | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xslt/uddf-export.xslt b/xslt/uddf-export.xslt index ff9f364..e558ca5 100644 --- a/xslt/uddf-export.xslt +++ b/xslt/uddf-export.xslt @@ -73,8 +73,11 @@ /xsl:attribute

[PATCH 3/7] Prevent UserID from being 'stuffed' into the start of UDDF export.

Due to there being no xsl template for the userID, it ended up getting inserted at the start of the output. This adds an empty template to map the settings element, preventing this erronious insertion. --- xslt/uddf-export.xslt | 2 ++ 1 file changed, 2 insertions(+) diff --git

[PATCH 2/7] Update dive site structure in UDDF export to match UDDF 3.2.0 specification.

The dive site structure in the UDDF export was using an old structure where each site is simply listed as a dive_site. The new structure requires a single divesite containing at least one divebase - a base location where you are diving from, and at least one site. As subsurface only tracks sites