From b90400876fa1a28d12cdc2854303bee101696b10 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Tue, 26 Feb 2013 08:39:09 -0800
Subject: Update DivingLog 5.08 export files

Two XML files, one all imperial, one all metric
Quick inspection shows that there is no indication whatsoever on metric vs
imperial in the file. That is of course completely moronic and makes
automated import more or less impossible.

I also added a different zip file from DivingLog - quick analysis shows
that this is simply the corresponding xml file, wrapped in a zip
container. So this should be trivial to add.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 dives/TestDiveDiveLog5.08.udcf               | 113 ----
 dives/TestDiveDiveLog5.08.uddf               | 385 --------------
 dives/TestDiveDiveLog5.08.xml                | 742 ---------------------------
 dives/TestDiveDiveLog5.08_RTF_compressed.zip | Bin 2003 -> 0 bytes
 dives/TestDiveDivingLog5.08.udcf             | 113 ++++
 dives/TestDiveDivingLog5.08.uddf             | 385 ++++++++++++++
 dives/TestDiveDivingLog5.08allimperial.xml   | 737 ++++++++++++++++++++++++++
 dives/TestDiveDivingLog5.08allmetric.xml     | 737 ++++++++++++++++++++++++++
 dives/TestDiveDivingLog5.08allmetric.zip     | Bin 0 -> 1960 bytes
 9 files changed, 1972 insertions(+), 1240 deletions(-)
 delete mode 100755 dives/TestDiveDiveLog5.08.udcf
 delete mode 100755 dives/TestDiveDiveLog5.08.uddf
 delete mode 100755 dives/TestDiveDiveLog5.08.xml
 delete mode 100755 dives/TestDiveDiveLog5.08_RTF_compressed.zip
 create mode 100755 dives/TestDiveDivingLog5.08.udcf
 create mode 100755 dives/TestDiveDivingLog5.08.uddf
 create mode 100755 dives/TestDiveDivingLog5.08allimperial.xml
 create mode 100755 dives/TestDiveDivingLog5.08allmetric.xml
 create mode 100755 dives/TestDiveDivingLog5.08allmetric.zip

(limited to 'dives')

diff --git a/dives/TestDiveDiveLog5.08.udcf b/dives/TestDiveDiveLog5.08.udcf
deleted file mode 100755
index 2dd824610..000000000
--- a/dives/TestDiveDiveLog5.08.udcf
+++ /dev/null
@@ -1,113 +0,0 @@
-<PROFILE UDCF="1">
-  <!--UDCF file created by Diving Log 5.0 (www.divinglog.de) at 25.02.2013 20:17:06-->
-  <UNITS>Metric</UNITS>
-  <DEVICE>
-    <VENDOR>Sven Knoch</VENDOR>
-    <MODEL>Diving Log</MODEL>
-    <VERSION>5.0.8.0</VERSION>
-  </DEVICE>
-  <ADDINFO>
-    <TOTALDIVES>83</TOTALDIVES>
-  </ADDINFO>
-  <REPGROUP>
-    <DIVE>
-      <PLACE>USA, Hoodsport, WA, Sund Rock</PLACE>
-      <DATE>
-        <YEAR>2011</YEAR>
-        <MONTH>05</MONTH>
-        <DAY>17</DAY>
-      </DATE>
-      <TIME>
-        <HOUR>11</HOUR>
-        <MINUTE>01</MINUTE>
-      </TIME>
-      <SURFACEINTERVAL>infinity</SURFACEINTERVAL>
-      <TEMPERATURE>10.0</TEMPERATURE>
-      <DENSITY>1030.0</DENSITY>
-      <ALTITUDE>0.0</ALTITUDE>
-      <GASES>
-        <MIX>
-          <MIXNAME>RealAir</MIXNAME>
-          <TANK>
-            <TANKVOLUME>11.7</TANKVOLUME>
-            <PSTART>165.0</PSTART>
-            <PEND>69.0</PEND>
-          </TANK>
-          <O2>0.21</O2>
-          <N2>0.79</N2>
-          <HE>0.00</HE>
-        </MIX>
-      </GASES>
-      <DELTAMODE />
-      <SAMPLES>
-        <DELTA>30.0</DELTA>
-        <SWITCH>RealAir</SWITCH>
-        <D>0.00</D>
-        <D>2.74</D>
-        <D>4.88</D>
-        <D>8.53</D>
-        <D>12.19</D>
-        <D>14.02</D>
-        <D>16.76</D>
-        <D>19.51</D>
-        <D>22.86</D>
-        <D>24.69</D>
-        <D>23.77</D>
-        <D>23.16</D>
-        <D>23.47</D>
-        <D>22.25</D>
-        <D>21.64</D>
-        <D>21.95</D>
-        <D>21.03</D>
-        <D>21.03</D>
-        <D>18.90</D>
-        <D>17.98</D>
-        <D>17.07</D>
-        <D>16.46</D>
-        <D>15.85</D>
-        <D>15.54</D>
-        <D>14.63</D>
-        <D>13.72</D>
-        <D>12.50</D>
-        <D>11.89</D>
-        <D>11.58</D>
-        <D>11.58</D>
-        <D>11.89</D>
-        <D>11.28</D>
-        <D>11.28</D>
-        <D>11.89</D>
-        <D>11.89</D>
-        <D>11.58</D>
-        <D>10.36</D>
-        <D>10.67</D>
-        <D>10.67</D>
-        <D>11.28</D>
-        <D>11.28</D>
-        <D>10.67</D>
-        <D>11.28</D>
-        <D>11.28</D>
-        <D>10.97</D>
-        <D>9.75</D>
-        <D>8.84</D>
-        <D>7.92</D>
-        <D>8.23</D>
-        <D>7.01</D>
-        <D>5.79</D>
-        <D>6.10</D>
-        <D>5.49</D>
-        <D>5.79</D>
-        <D>3.96</D>
-        <D>5.18</D>
-        <D>5.18</D>
-        <D>5.49</D>
-        <D>5.18</D>
-        <D>5.18</D>
-        <D>3.96</D>
-        <D>3.35</D>
-        <D>2.44</D>
-        <D>2.13</D>
-        <D>0.00</D>
-      </SAMPLES>
-    </DIVE>
-  </REPGROUP>
-</PROFILE>
\ No newline at end of file
diff --git a/dives/TestDiveDiveLog5.08.uddf b/dives/TestDiveDiveLog5.08.uddf
deleted file mode 100755
index 53bcae287..000000000
--- a/dives/TestDiveDiveLog5.08.uddf
+++ /dev/null
@@ -1,385 +0,0 @@
-<uddf version="2.2.0">
-  <!--UDDF file created by Diving Log 5.0 (www.divinglog.de) at 25.02.2013 19:43:51-->
-  <generator>
-    <name>Diving Log 5.0</name>
-    <manufacturer>
-      <name>Sven Knoch</name>
-      <contact>
-        <email>info@divinglog.de</email>
-        <homepage>http://www.divinglog.de/</homepage>
-      </contact>
-    </manufacturer>
-    <version>5.0.8.0</version>
-    <date>
-      <year>2013</year>
-      <month>2</month>
-      <day>25</day>
-    </date>
-  </generator>
-  <gasdefinitions>
-    <mix id="air">
-      <name>air</name>
-      <o2>0.210</o2>
-      <n2>0.790</n2>
-      <he>0.000</he>
-      <ar>0.000</ar>
-      <h2>0.000</h2>
-    </mix>
-  </gasdefinitions>
-  <profiledata>
-    <repetitiongroup id="1">
-      <dive id="46">
-        <date>
-          <year>2011</year>
-          <month>5</month>
-          <day>17</day>
-        </date>
-        <time>
-          <hour>11</hour>
-          <minute>1</minute>
-        </time>
-        <divenumber>46</divenumber>
-        <airtemperature>287.1</airtemperature>
-        <lowesttemperature>283.1</lowesttemperature>
-        <greatestdepth>24.7</greatestdepth>
-        <density>1030.0</density>
-        <notes>
-          <text>Second deep dive
-Linus and I planned and executed - Alex just watching
-down to 80ft (overshot by one)
-then the reverse sqeeze BS started again
-So the rest of the dive is a loooong buoyancy exercise
-Still, fun dive - but I skipped the next one and called it a day.</text>
-        </notes>
-        <samples>
-          <waypoint>
-            <depth>0.00</depth>
-            <divetime>0</divetime>
-            <temperature>287.1</temperature>
-            <switchmix ref="air" />
-          </waypoint>
-          <waypoint>
-            <depth>2.74</depth>
-            <divetime>30</divetime>
-            <temperature>287.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>4.88</depth>
-            <divetime>60</divetime>
-            <temperature>287.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>8.53</depth>
-            <divetime>90</divetime>
-            <temperature>287.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>12.19</depth>
-            <divetime>120</divetime>
-            <temperature>287.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>14.02</depth>
-            <divetime>150</divetime>
-            <temperature>287.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>16.76</depth>
-            <divetime>180</divetime>
-            <temperature>287.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>19.51</depth>
-            <divetime>210</divetime>
-            <temperature>287.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>22.86</depth>
-            <divetime>240</divetime>
-            <temperature>287.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>24.69</depth>
-            <divetime>270</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>23.77</depth>
-            <divetime>300</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>23.16</depth>
-            <divetime>330</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>23.47</depth>
-            <divetime>360</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>22.25</depth>
-            <divetime>390</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>21.64</depth>
-            <divetime>420</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>21.95</depth>
-            <divetime>450</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>21.03</depth>
-            <divetime>480</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>21.03</depth>
-            <divetime>510</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>18.90</depth>
-            <divetime>540</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>17.98</depth>
-            <divetime>570</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>17.07</depth>
-            <divetime>600</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>16.46</depth>
-            <divetime>630</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>15.85</depth>
-            <divetime>660</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>15.54</depth>
-            <divetime>690</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>14.63</depth>
-            <divetime>720</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>13.72</depth>
-            <divetime>750</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>12.50</depth>
-            <divetime>780</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>11.89</depth>
-            <divetime>810</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>11.58</depth>
-            <divetime>840</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>11.58</depth>
-            <divetime>870</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>11.89</depth>
-            <divetime>900</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>11.28</depth>
-            <divetime>930</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>11.28</depth>
-            <divetime>960</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>11.89</depth>
-            <divetime>990</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>11.89</depth>
-            <divetime>1020</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>11.58</depth>
-            <divetime>1050</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>10.36</depth>
-            <divetime>1080</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>10.67</depth>
-            <divetime>1110</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>10.67</depth>
-            <divetime>1140</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>11.28</depth>
-            <divetime>1170</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>11.28</depth>
-            <divetime>1200</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>10.67</depth>
-            <divetime>1230</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>11.28</depth>
-            <divetime>1260</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>11.28</depth>
-            <divetime>1290</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>10.97</depth>
-            <divetime>1320</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>9.75</depth>
-            <divetime>1350</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>8.84</depth>
-            <divetime>1380</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>7.92</depth>
-            <divetime>1410</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>8.23</depth>
-            <divetime>1440</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>7.01</depth>
-            <divetime>1470</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>5.79</depth>
-            <divetime>1500</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>6.10</depth>
-            <divetime>1530</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>5.49</depth>
-            <divetime>1560</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>5.79</depth>
-            <divetime>1590</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>3.96</depth>
-            <divetime>1620</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>5.18</depth>
-            <divetime>1650</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>5.18</depth>
-            <divetime>1680</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>5.49</depth>
-            <divetime>1710</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>5.18</depth>
-            <divetime>1740</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>5.18</depth>
-            <divetime>1770</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>3.96</depth>
-            <divetime>1800</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>3.35</depth>
-            <divetime>1830</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>2.44</depth>
-            <divetime>1860</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>2.13</depth>
-            <divetime>1890</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-          <waypoint>
-            <depth>0.00</depth>
-            <divetime>1920</divetime>
-            <temperature>283.1</temperature>
-          </waypoint>
-        </samples>
-      </dive>
-    </repetitiongroup>
-  </profiledata>
-</uddf>
\ No newline at end of file
diff --git a/dives/TestDiveDiveLog5.08.xml b/dives/TestDiveDiveLog5.08.xml
deleted file mode 100755
index 3b5e3c48c..000000000
--- a/dives/TestDiveDiveLog5.08.xml
+++ /dev/null
@@ -1,742 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Divinglog DBVersion="4.1.0">
-  <Header>
-    <AppName>Diving Log 5.0</AppName>
-    <AppVersion>5.0.8.0</AppVersion>
-    <ExportDate>2013-02-26T03:44:35</ExportDate>
-  </Header>
-  <Logbook>
-    <Dive ID="46" UUID="C5F1F1A3-D390-4D17-9A4F-D3DA39C1AF7F" Updated="2011-09-05T04:33:17">
-      <Number>46</Number>
-      <Divedate>2011-05-17</Divedate>
-      <Entrytime>11:01</Entrytime>
-      <Surfint>13:31</Surfint>
-      <Country ID="" Name="USA" />
-      <City ID="" Name="Hoodsport, WA" />
-      <Place ID="" Name="Sund Rock">
-        <Lat>
-        </Lat>
-        <Lon>
-        </Lon>
-      </Place>
-      <Divetime>32.00</Divetime>
-      <Depth>24.69</Depth>
-      <Buddy IDs="" Names="Linus" />
-      <Signature />
-      <Comments>Second deep dive
-Linus and I planned and executed - Alex just watching
-down to 80ft (overshot by one)
-then the reverse sqeeze BS started again
-So the rest of the dive is a loooong buoyancy exercise
-Still, fun dive - but I skipped the next one and called it a day.</Comments>
-      <Water>Salt</Water>
-      <Entry>Shore</Entry>
-      <Divetype>
-      </Divetype>
-      <Tanktype>Steel</Tanktype>
-      <Tanksize>11.66</Tanksize>
-      <PresS>164.99</PresS>
-      <PresE>69.02</PresE>
-      <Gas>
-      </Gas>
-      <Weather>Sunny</Weather>
-      <UWCurrent>
-      </UWCurrent>
-      <Surface>
-      </Surface>
-      <Visibility>Bad</Visibility>
-      <Airtemp>14.00</Airtemp>
-      <Watertemp>10.00</Watertemp>
-      <Weight>16.37</Weight>
-      <Deco>False</Deco>
-      <Decostops>
-      </Decostops>
-      <Rep>False</Rep>
-      <Altitude>
-      </Altitude>
-      <Divesuit>Drysuit</Divesuit>
-      <Computer>Vyper</Computer>
-      <ProfileInt>30</ProfileInt>
-      <Profile>
-        <P Time="30">
-          <Depth>0.00</Depth>
-          <Temp>57.2</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="60">
-          <Depth>2.74</Depth>
-          <Temp>57.2</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="90">
-          <Depth>4.88</Depth>
-          <Temp>57.2</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="120">
-          <Depth>8.53</Depth>
-          <Temp>57.2</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="150">
-          <Depth>12.19</Depth>
-          <Temp>57.2</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="180">
-          <Depth>14.02</Depth>
-          <Temp>57.2</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="210">
-          <Depth>16.76</Depth>
-          <Temp>57.2</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="240">
-          <Depth>19.51</Depth>
-          <Temp>57.2</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="270">
-          <Depth>22.86</Depth>
-          <Temp>57.2</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="300">
-          <Depth>24.69</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="330">
-          <Depth>23.77</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="360">
-          <Depth>23.16</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="390">
-          <Depth>23.47</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="420">
-          <Depth>22.25</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="450">
-          <Depth>21.64</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="480">
-          <Depth>21.95</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="510">
-          <Depth>21.03</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="540">
-          <Depth>21.03</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="570">
-          <Depth>18.90</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="600">
-          <Depth>17.98</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="630">
-          <Depth>17.07</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="660">
-          <Depth>16.46</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="690">
-          <Depth>15.85</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="720">
-          <Depth>15.54</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="750">
-          <Depth>14.63</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="780">
-          <Depth>13.72</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="810">
-          <Depth>12.50</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="840">
-          <Depth>11.89</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="870">
-          <Depth>11.58</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="900">
-          <Depth>11.58</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="930">
-          <Depth>11.89</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="960">
-          <Depth>11.28</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="990">
-          <Depth>11.28</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1020">
-          <Depth>11.89</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1050">
-          <Depth>11.89</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1080">
-          <Depth>11.58</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1110">
-          <Depth>10.36</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1140">
-          <Depth>10.67</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1170">
-          <Depth>10.67</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1200">
-          <Depth>11.28</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1230">
-          <Depth>11.28</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1260">
-          <Depth>10.67</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1290">
-          <Depth>11.28</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1320">
-          <Depth>11.28</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1350">
-          <Depth>10.97</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1380">
-          <Depth>9.75</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1410">
-          <Depth>8.84</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1440">
-          <Depth>7.92</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1470">
-          <Depth>8.23</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1500">
-          <Depth>7.01</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1530">
-          <Depth>5.79</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1560">
-          <Depth>6.10</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1590">
-          <Depth>5.49</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1620">
-          <Depth>5.79</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1650">
-          <Depth>3.96</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1680">
-          <Depth>5.18</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1710">
-          <Depth>5.18</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1740">
-          <Depth>5.49</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1770">
-          <Depth>5.18</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1800">
-          <Depth>5.18</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1830">
-          <Depth>3.96</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1860">
-          <Depth>3.35</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1890">
-          <Depth>2.44</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1920">
-          <Depth>2.13</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-        <P Time="1950">
-          <Depth>0.00</Depth>
-          <Temp>50.0</Temp>
-          <Warning>00000</Warning>
-          <Press1>0.0</Press1>
-          <Press2>0.0</Press2>
-          <Press3>0.0</Press3>
-          <RBT>0</RBT>
-          <Heartrate>0</Heartrate>
-        </P>
-      </Profile>
-      <UsedEquip>
-      </UsedEquip>
-      <PresW>182.02</PresW>
-      <DepthAvg>11.65</DepthAvg>
-      <Profile4 />
-      <Profile5 />
-      <RepNumber />
-      <VisHor>15-20ft</VisHor>
-      <VisVer>
-      </VisVer>
-      <CNS>
-      </CNS>
-      <PGStart>
-      </PGStart>
-      <PGEnd>
-      </PGEnd>
-      <Divemaster>Alex</Divemaster>
-      <Boat>
-      </Boat>
-      <Rating>0</Rating>
-      <O2>32.00</O2>
-      <He />
-      <DblTank>False</DblTank>
-      <SupplyType />
-      <MinPPO2 />
-      <MaxPPO2>0.00</MaxPPO2>
-      <ShopID />
-      <TripID />
-    </Dive>
-  </Logbook>
-</Divinglog>
\ No newline at end of file
diff --git a/dives/TestDiveDiveLog5.08_RTF_compressed.zip b/dives/TestDiveDiveLog5.08_RTF_compressed.zip
deleted file mode 100755
index 5d90d70ca..000000000
Binary files a/dives/TestDiveDiveLog5.08_RTF_compressed.zip and /dev/null differ
diff --git a/dives/TestDiveDivingLog5.08.udcf b/dives/TestDiveDivingLog5.08.udcf
new file mode 100755
index 000000000..2dd824610
--- /dev/null
+++ b/dives/TestDiveDivingLog5.08.udcf
@@ -0,0 +1,113 @@
+<PROFILE UDCF="1">
+  <!--UDCF file created by Diving Log 5.0 (www.divinglog.de) at 25.02.2013 20:17:06-->
+  <UNITS>Metric</UNITS>
+  <DEVICE>
+    <VENDOR>Sven Knoch</VENDOR>
+    <MODEL>Diving Log</MODEL>
+    <VERSION>5.0.8.0</VERSION>
+  </DEVICE>
+  <ADDINFO>
+    <TOTALDIVES>83</TOTALDIVES>
+  </ADDINFO>
+  <REPGROUP>
+    <DIVE>
+      <PLACE>USA, Hoodsport, WA, Sund Rock</PLACE>
+      <DATE>
+        <YEAR>2011</YEAR>
+        <MONTH>05</MONTH>
+        <DAY>17</DAY>
+      </DATE>
+      <TIME>
+        <HOUR>11</HOUR>
+        <MINUTE>01</MINUTE>
+      </TIME>
+      <SURFACEINTERVAL>infinity</SURFACEINTERVAL>
+      <TEMPERATURE>10.0</TEMPERATURE>
+      <DENSITY>1030.0</DENSITY>
+      <ALTITUDE>0.0</ALTITUDE>
+      <GASES>
+        <MIX>
+          <MIXNAME>RealAir</MIXNAME>
+          <TANK>
+            <TANKVOLUME>11.7</TANKVOLUME>
+            <PSTART>165.0</PSTART>
+            <PEND>69.0</PEND>
+          </TANK>
+          <O2>0.21</O2>
+          <N2>0.79</N2>
+          <HE>0.00</HE>
+        </MIX>
+      </GASES>
+      <DELTAMODE />
+      <SAMPLES>
+        <DELTA>30.0</DELTA>
+        <SWITCH>RealAir</SWITCH>
+        <D>0.00</D>
+        <D>2.74</D>
+        <D>4.88</D>
+        <D>8.53</D>
+        <D>12.19</D>
+        <D>14.02</D>
+        <D>16.76</D>
+        <D>19.51</D>
+        <D>22.86</D>
+        <D>24.69</D>
+        <D>23.77</D>
+        <D>23.16</D>
+        <D>23.47</D>
+        <D>22.25</D>
+        <D>21.64</D>
+        <D>21.95</D>
+        <D>21.03</D>
+        <D>21.03</D>
+        <D>18.90</D>
+        <D>17.98</D>
+        <D>17.07</D>
+        <D>16.46</D>
+        <D>15.85</D>
+        <D>15.54</D>
+        <D>14.63</D>
+        <D>13.72</D>
+        <D>12.50</D>
+        <D>11.89</D>
+        <D>11.58</D>
+        <D>11.58</D>
+        <D>11.89</D>
+        <D>11.28</D>
+        <D>11.28</D>
+        <D>11.89</D>
+        <D>11.89</D>
+        <D>11.58</D>
+        <D>10.36</D>
+        <D>10.67</D>
+        <D>10.67</D>
+        <D>11.28</D>
+        <D>11.28</D>
+        <D>10.67</D>
+        <D>11.28</D>
+        <D>11.28</D>
+        <D>10.97</D>
+        <D>9.75</D>
+        <D>8.84</D>
+        <D>7.92</D>
+        <D>8.23</D>
+        <D>7.01</D>
+        <D>5.79</D>
+        <D>6.10</D>
+        <D>5.49</D>
+        <D>5.79</D>
+        <D>3.96</D>
+        <D>5.18</D>
+        <D>5.18</D>
+        <D>5.49</D>
+        <D>5.18</D>
+        <D>5.18</D>
+        <D>3.96</D>
+        <D>3.35</D>
+        <D>2.44</D>
+        <D>2.13</D>
+        <D>0.00</D>
+      </SAMPLES>
+    </DIVE>
+  </REPGROUP>
+</PROFILE>
\ No newline at end of file
diff --git a/dives/TestDiveDivingLog5.08.uddf b/dives/TestDiveDivingLog5.08.uddf
new file mode 100755
index 000000000..53bcae287
--- /dev/null
+++ b/dives/TestDiveDivingLog5.08.uddf
@@ -0,0 +1,385 @@
+<uddf version="2.2.0">
+  <!--UDDF file created by Diving Log 5.0 (www.divinglog.de) at 25.02.2013 19:43:51-->
+  <generator>
+    <name>Diving Log 5.0</name>
+    <manufacturer>
+      <name>Sven Knoch</name>
+      <contact>
+        <email>info@divinglog.de</email>
+        <homepage>http://www.divinglog.de/</homepage>
+      </contact>
+    </manufacturer>
+    <version>5.0.8.0</version>
+    <date>
+      <year>2013</year>
+      <month>2</month>
+      <day>25</day>
+    </date>
+  </generator>
+  <gasdefinitions>
+    <mix id="air">
+      <name>air</name>
+      <o2>0.210</o2>
+      <n2>0.790</n2>
+      <he>0.000</he>
+      <ar>0.000</ar>
+      <h2>0.000</h2>
+    </mix>
+  </gasdefinitions>
+  <profiledata>
+    <repetitiongroup id="1">
+      <dive id="46">
+        <date>
+          <year>2011</year>
+          <month>5</month>
+          <day>17</day>
+        </date>
+        <time>
+          <hour>11</hour>
+          <minute>1</minute>
+        </time>
+        <divenumber>46</divenumber>
+        <airtemperature>287.1</airtemperature>
+        <lowesttemperature>283.1</lowesttemperature>
+        <greatestdepth>24.7</greatestdepth>
+        <density>1030.0</density>
+        <notes>
+          <text>Second deep dive
+Linus and I planned and executed - Alex just watching
+down to 80ft (overshot by one)
+then the reverse sqeeze BS started again
+So the rest of the dive is a loooong buoyancy exercise
+Still, fun dive - but I skipped the next one and called it a day.</text>
+        </notes>
+        <samples>
+          <waypoint>
+            <depth>0.00</depth>
+            <divetime>0</divetime>
+            <temperature>287.1</temperature>
+            <switchmix ref="air" />
+          </waypoint>
+          <waypoint>
+            <depth>2.74</depth>
+            <divetime>30</divetime>
+            <temperature>287.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>4.88</depth>
+            <divetime>60</divetime>
+            <temperature>287.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>8.53</depth>
+            <divetime>90</divetime>
+            <temperature>287.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>12.19</depth>
+            <divetime>120</divetime>
+            <temperature>287.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>14.02</depth>
+            <divetime>150</divetime>
+            <temperature>287.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>16.76</depth>
+            <divetime>180</divetime>
+            <temperature>287.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>19.51</depth>
+            <divetime>210</divetime>
+            <temperature>287.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>22.86</depth>
+            <divetime>240</divetime>
+            <temperature>287.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>24.69</depth>
+            <divetime>270</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>23.77</depth>
+            <divetime>300</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>23.16</depth>
+            <divetime>330</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>23.47</depth>
+            <divetime>360</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>22.25</depth>
+            <divetime>390</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>21.64</depth>
+            <divetime>420</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>21.95</depth>
+            <divetime>450</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>21.03</depth>
+            <divetime>480</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>21.03</depth>
+            <divetime>510</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>18.90</depth>
+            <divetime>540</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>17.98</depth>
+            <divetime>570</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>17.07</depth>
+            <divetime>600</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>16.46</depth>
+            <divetime>630</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>15.85</depth>
+            <divetime>660</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>15.54</depth>
+            <divetime>690</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>14.63</depth>
+            <divetime>720</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>13.72</depth>
+            <divetime>750</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>12.50</depth>
+            <divetime>780</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>11.89</depth>
+            <divetime>810</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>11.58</depth>
+            <divetime>840</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>11.58</depth>
+            <divetime>870</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>11.89</depth>
+            <divetime>900</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>11.28</depth>
+            <divetime>930</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>11.28</depth>
+            <divetime>960</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>11.89</depth>
+            <divetime>990</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>11.89</depth>
+            <divetime>1020</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>11.58</depth>
+            <divetime>1050</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>10.36</depth>
+            <divetime>1080</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>10.67</depth>
+            <divetime>1110</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>10.67</depth>
+            <divetime>1140</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>11.28</depth>
+            <divetime>1170</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>11.28</depth>
+            <divetime>1200</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>10.67</depth>
+            <divetime>1230</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>11.28</depth>
+            <divetime>1260</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>11.28</depth>
+            <divetime>1290</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>10.97</depth>
+            <divetime>1320</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>9.75</depth>
+            <divetime>1350</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>8.84</depth>
+            <divetime>1380</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>7.92</depth>
+            <divetime>1410</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>8.23</depth>
+            <divetime>1440</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>7.01</depth>
+            <divetime>1470</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>5.79</depth>
+            <divetime>1500</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>6.10</depth>
+            <divetime>1530</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>5.49</depth>
+            <divetime>1560</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>5.79</depth>
+            <divetime>1590</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>3.96</depth>
+            <divetime>1620</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>5.18</depth>
+            <divetime>1650</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>5.18</depth>
+            <divetime>1680</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>5.49</depth>
+            <divetime>1710</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>5.18</depth>
+            <divetime>1740</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>5.18</depth>
+            <divetime>1770</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>3.96</depth>
+            <divetime>1800</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>3.35</depth>
+            <divetime>1830</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>2.44</depth>
+            <divetime>1860</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>2.13</depth>
+            <divetime>1890</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+          <waypoint>
+            <depth>0.00</depth>
+            <divetime>1920</divetime>
+            <temperature>283.1</temperature>
+          </waypoint>
+        </samples>
+      </dive>
+    </repetitiongroup>
+  </profiledata>
+</uddf>
\ No newline at end of file
diff --git a/dives/TestDiveDivingLog5.08allimperial.xml b/dives/TestDiveDivingLog5.08allimperial.xml
new file mode 100755
index 000000000..9b12078b8
--- /dev/null
+++ b/dives/TestDiveDivingLog5.08allimperial.xml
@@ -0,0 +1,737 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Divinglog DBVersion="4.1.0">
+  <Header>
+    <AppName>Diving Log 5.0</AppName>
+    <AppVersion>5.0.8.0</AppVersion>
+    <ExportDate>2013-02-26T16:32:08</ExportDate>
+  </Header>
+  <Logbook>
+    <Dive ID="1" UUID="2EEC58E4-F337-4891-B306-3860E134237A" Updated="2013-02-26T16:30:41">
+      <Number>1</Number>
+      <Divedate>2011-05-17</Divedate>
+      <Entrytime>11:01</Entrytime>
+      <Surfint>13:31</Surfint>
+      <Country ID="" Name="USA" />
+      <City ID="" Name="Hoodsport, WA" />
+      <Place ID="" Name="Sund Rock">
+        <Lat>
+        </Lat>
+        <Lon>
+        </Lon>
+      </Place>
+      <Divetime>32.00</Divetime>
+      <Depth>24.69</Depth>
+      <Buddy IDs="" Names="Linus" />
+      <Signature>
+      </Signature>
+      <Comments>{\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fnil\fcharset0 Microsoft Sans Serif;}}
+\viewkind4\uc1\pard\lang1033\f0\fs17 All data in DivingLog is Imperial\par
+}
+</Comments>
+      <Water>Salt</Water>
+      <Entry>Shore</Entry>
+      <Divetype>Night</Divetype>
+      <Tanktype>Steel</Tanktype>
+      <Tanksize>11.66</Tanksize>
+      <PresS>165.47</PresS>
+      <PresE>68.95</PresE>
+      <Gas>
+      </Gas>
+      <Weather>Sunny</Weather>
+      <UWCurrent>No Current</UWCurrent>
+      <Surface>No Waves</Surface>
+      <Visibility>Bad</Visibility>
+      <Airtemp>14.00</Airtemp>
+      <Watertemp>10.00</Watertemp>
+      <Weight>16.33</Weight>
+      <Deco>False</Deco>
+      <Decostops>This is the "DecoStop Details" text field
+I also added the silly table groups - should show up as A and K</Decostops>
+      <Rep>False</Rep>
+      <Altitude>0 ft - 3000 ft</Altitude>
+      <Divesuit>Drysuit</Divesuit>
+      <Computer>Vyper</Computer>
+      <ProfileInt>30</ProfileInt>
+      <Profile>
+        <P Time="30">
+          <Depth>0.00</Depth>
+          <Temp>57.2</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="60">
+          <Depth>8.99</Depth>
+          <Temp>57.2</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="90">
+          <Depth>16.01</Depth>
+          <Temp>57.2</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="120">
+          <Depth>27.99</Depth>
+          <Temp>57.2</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="150">
+          <Depth>39.99</Depth>
+          <Temp>57.2</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="180">
+          <Depth>46.00</Depth>
+          <Temp>57.2</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="210">
+          <Depth>54.99</Depth>
+          <Temp>57.2</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="240">
+          <Depth>64.01</Depth>
+          <Temp>57.2</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="270">
+          <Depth>75.00</Depth>
+          <Temp>57.2</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="300">
+          <Depth>81.00</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="330">
+          <Depth>77.99</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="360">
+          <Depth>75.98</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="390">
+          <Depth>77.00</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="420">
+          <Depth>73.00</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="450">
+          <Depth>71.00</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="480">
+          <Depth>72.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="510">
+          <Depth>69.00</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="540">
+          <Depth>69.00</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="570">
+          <Depth>62.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="600">
+          <Depth>58.99</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="630">
+          <Depth>56.00</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="660">
+          <Depth>54.00</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="690">
+          <Depth>52.00</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="720">
+          <Depth>50.98</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="750">
+          <Depth>48.00</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="780">
+          <Depth>45.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="810">
+          <Depth>41.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="840">
+          <Depth>39.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="870">
+          <Depth>37.99</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="900">
+          <Depth>37.99</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="930">
+          <Depth>39.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="960">
+          <Depth>37.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="990">
+          <Depth>37.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1020">
+          <Depth>39.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1050">
+          <Depth>39.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1080">
+          <Depth>37.99</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1110">
+          <Depth>33.99</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1140">
+          <Depth>35.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1170">
+          <Depth>35.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1200">
+          <Depth>37.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1230">
+          <Depth>37.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1260">
+          <Depth>35.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1290">
+          <Depth>37.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1320">
+          <Depth>37.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1350">
+          <Depth>35.99</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1380">
+          <Depth>31.99</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1410">
+          <Depth>29.00</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1440">
+          <Depth>25.98</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1470">
+          <Depth>27.00</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1500">
+          <Depth>23.00</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1530">
+          <Depth>19.00</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1560">
+          <Depth>20.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1590">
+          <Depth>18.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1620">
+          <Depth>19.00</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1650">
+          <Depth>12.99</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1680">
+          <Depth>16.99</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1710">
+          <Depth>16.99</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1740">
+          <Depth>18.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1770">
+          <Depth>16.99</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1800">
+          <Depth>16.99</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1830">
+          <Depth>12.99</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1860">
+          <Depth>10.99</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1890">
+          <Depth>8.01</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1920">
+          <Depth>6.99</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1950">
+          <Depth>0.00</Depth>
+          <Temp>50.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+      </Profile>
+      <UsedEquip>
+      </UsedEquip>
+      <PresW>182.02</PresW>
+      <DepthAvg>12.02</DepthAvg>
+      <Profile4>
+      </Profile4>
+      <Profile5>
+      </Profile5>
+      <RepNumber />
+      <VisHor>15-20ft</VisHor>
+      <VisVer>
+      </VisVer>
+      <CNS>
+      </CNS>
+      <PGStart>A</PGStart>
+      <PGEnd>K</PGEnd>
+      <Divemaster>Alex</Divemaster>
+      <Boat>
+      </Boat>
+      <Rating>4</Rating>
+      <O2>32.00</O2>
+      <He />
+      <DblTank>False</DblTank>
+      <SupplyType />
+      <MinPPO2 />
+      <MaxPPO2>0.00</MaxPPO2>
+      <ShopID />
+      <TripID />
+    </Dive>
+  </Logbook>
+</Divinglog>
\ No newline at end of file
diff --git a/dives/TestDiveDivingLog5.08allmetric.xml b/dives/TestDiveDivingLog5.08allmetric.xml
new file mode 100755
index 000000000..61c457678
--- /dev/null
+++ b/dives/TestDiveDivingLog5.08allmetric.xml
@@ -0,0 +1,737 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Divinglog DBVersion="4.1.0">
+  <Header>
+    <AppName>Diving Log 5.0</AppName>
+    <AppVersion>5.0.8.0</AppVersion>
+    <ExportDate>2013-02-26T16:34:07</ExportDate>
+  </Header>
+  <Logbook>
+    <Dive ID="1" UUID="2EEC58E4-F337-4891-B306-3860E134237A" Updated="2013-02-26T16:30:41">
+      <Number>1</Number>
+      <Divedate>2011-05-17</Divedate>
+      <Entrytime>11:01</Entrytime>
+      <Surfint>13:31</Surfint>
+      <Country ID="" Name="USA" />
+      <City ID="" Name="Hoodsport, WA" />
+      <Place ID="" Name="Sund Rock">
+        <Lat>
+        </Lat>
+        <Lon>
+        </Lon>
+      </Place>
+      <Divetime>32.00</Divetime>
+      <Depth>24.69</Depth>
+      <Buddy IDs="" Names="Linus" />
+      <Signature>
+      </Signature>
+      <Comments>{\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fnil\fcharset0 Microsoft Sans Serif;}}
+\viewkind4\uc1\pard\lang1033\f0\fs17 All data in DivingLog is Imperial\par
+}
+</Comments>
+      <Water>Salt</Water>
+      <Entry>Shore</Entry>
+      <Divetype>Night</Divetype>
+      <Tanktype>Steel</Tanktype>
+      <Tanksize>11.66</Tanksize>
+      <PresS>165.47</PresS>
+      <PresE>68.95</PresE>
+      <Gas>
+      </Gas>
+      <Weather>Sunny</Weather>
+      <UWCurrent>No Current</UWCurrent>
+      <Surface>No Waves</Surface>
+      <Visibility>Bad</Visibility>
+      <Airtemp>14.00</Airtemp>
+      <Watertemp>10.00</Watertemp>
+      <Weight>16.33</Weight>
+      <Deco>False</Deco>
+      <Decostops>This is the "DecoStop Details" text field
+I also added the silly table groups - should show up as A and K</Decostops>
+      <Rep>False</Rep>
+      <Altitude>0 ft - 3000 ft</Altitude>
+      <Divesuit>Drysuit</Divesuit>
+      <Computer>Vyper</Computer>
+      <ProfileInt>30</ProfileInt>
+      <Profile>
+        <P Time="30">
+          <Depth>0.00</Depth>
+          <Temp>14.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="60">
+          <Depth>2.74</Depth>
+          <Temp>14.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="90">
+          <Depth>4.88</Depth>
+          <Temp>14.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="120">
+          <Depth>8.53</Depth>
+          <Temp>14.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="150">
+          <Depth>12.19</Depth>
+          <Temp>14.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="180">
+          <Depth>14.02</Depth>
+          <Temp>14.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="210">
+          <Depth>16.76</Depth>
+          <Temp>14.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="240">
+          <Depth>19.51</Depth>
+          <Temp>14.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="270">
+          <Depth>22.86</Depth>
+          <Temp>14.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="300">
+          <Depth>24.69</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="330">
+          <Depth>23.77</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="360">
+          <Depth>23.16</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="390">
+          <Depth>23.47</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="420">
+          <Depth>22.25</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="450">
+          <Depth>21.64</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="480">
+          <Depth>21.95</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="510">
+          <Depth>21.03</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="540">
+          <Depth>21.03</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="570">
+          <Depth>18.90</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="600">
+          <Depth>17.98</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="630">
+          <Depth>17.07</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="660">
+          <Depth>16.46</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="690">
+          <Depth>15.85</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="720">
+          <Depth>15.54</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="750">
+          <Depth>14.63</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="780">
+          <Depth>13.72</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="810">
+          <Depth>12.50</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="840">
+          <Depth>11.89</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="870">
+          <Depth>11.58</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="900">
+          <Depth>11.58</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="930">
+          <Depth>11.89</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="960">
+          <Depth>11.28</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="990">
+          <Depth>11.28</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1020">
+          <Depth>11.89</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1050">
+          <Depth>11.89</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1080">
+          <Depth>11.58</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1110">
+          <Depth>10.36</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1140">
+          <Depth>10.67</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1170">
+          <Depth>10.67</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1200">
+          <Depth>11.28</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1230">
+          <Depth>11.28</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1260">
+          <Depth>10.67</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1290">
+          <Depth>11.28</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1320">
+          <Depth>11.28</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1350">
+          <Depth>10.97</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1380">
+          <Depth>9.75</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1410">
+          <Depth>8.84</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1440">
+          <Depth>7.92</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1470">
+          <Depth>8.23</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1500">
+          <Depth>7.01</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1530">
+          <Depth>5.79</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1560">
+          <Depth>6.10</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1590">
+          <Depth>5.49</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1620">
+          <Depth>5.79</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1650">
+          <Depth>3.96</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1680">
+          <Depth>5.18</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1710">
+          <Depth>5.18</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1740">
+          <Depth>5.49</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1770">
+          <Depth>5.18</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1800">
+          <Depth>5.18</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1830">
+          <Depth>3.96</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1860">
+          <Depth>3.35</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1890">
+          <Depth>2.44</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1920">
+          <Depth>2.13</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+        <P Time="1950">
+          <Depth>0.00</Depth>
+          <Temp>10.0</Temp>
+          <Warning>00000</Warning>
+          <Press1>0.0</Press1>
+          <Press2>0.0</Press2>
+          <Press3>0.0</Press3>
+          <RBT>0</RBT>
+          <Heartrate>0</Heartrate>
+        </P>
+      </Profile>
+      <UsedEquip>
+      </UsedEquip>
+      <PresW>182.02</PresW>
+      <DepthAvg>12.02</DepthAvg>
+      <Profile4>
+      </Profile4>
+      <Profile5>
+      </Profile5>
+      <RepNumber />
+      <VisHor>15-20ft</VisHor>
+      <VisVer>
+      </VisVer>
+      <CNS>
+      </CNS>
+      <PGStart>A</PGStart>
+      <PGEnd>K</PGEnd>
+      <Divemaster>Alex</Divemaster>
+      <Boat>
+      </Boat>
+      <Rating>4</Rating>
+      <O2>32.00</O2>
+      <He />
+      <DblTank>False</DblTank>
+      <SupplyType />
+      <MinPPO2 />
+      <MaxPPO2>0.00</MaxPPO2>
+      <ShopID />
+      <TripID />
+    </Dive>
+  </Logbook>
+</Divinglog>
\ No newline at end of file
diff --git a/dives/TestDiveDivingLog5.08allmetric.zip b/dives/TestDiveDivingLog5.08allmetric.zip
new file mode 100755
index 000000000..62a58f376
Binary files /dev/null and b/dives/TestDiveDivingLog5.08allmetric.zip differ
-- 
cgit v1.2.3-70-g09d2