mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	Re-order the MacDive import
Next commit will do indentation so this one will keep it clear of what actually occurs. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
		
							parent
							
								
									6cd71882f2
								
							
						
					
					
						commit
						4f5db4a11f
					
				
					 1 changed files with 81 additions and 81 deletions
				
			
		| 
						 | 
					@ -66,49 +66,6 @@
 | 
				
			||||||
        </xsl:call-template>
 | 
					        </xsl:call-template>
 | 
				
			||||||
      </xsl:attribute>
 | 
					      </xsl:attribute>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      <xsl:choose>
 | 
					 | 
				
			||||||
        <xsl:when test="maxdepth != ''">
 | 
					 | 
				
			||||||
          <depth>
 | 
					 | 
				
			||||||
            <xsl:attribute name="max">
 | 
					 | 
				
			||||||
              <xsl:call-template name="depthConvert">
 | 
					 | 
				
			||||||
                <xsl:with-param name="depth">
 | 
					 | 
				
			||||||
                  <xsl:value-of select="maxdepth"/>
 | 
					 | 
				
			||||||
                </xsl:with-param>
 | 
					 | 
				
			||||||
                <xsl:with-param name="units" select="$units"/>
 | 
					 | 
				
			||||||
              </xsl:call-template>
 | 
					 | 
				
			||||||
            </xsl:attribute>
 | 
					 | 
				
			||||||
            <xsl:attribute name="mean">
 | 
					 | 
				
			||||||
              <xsl:call-template name="depthConvert">
 | 
					 | 
				
			||||||
                <xsl:with-param name="depth">
 | 
					 | 
				
			||||||
                  <xsl:value-of select="avgdepth"/>
 | 
					 | 
				
			||||||
                </xsl:with-param>
 | 
					 | 
				
			||||||
                <xsl:with-param name="units" select="$units"/>
 | 
					 | 
				
			||||||
              </xsl:call-template>
 | 
					 | 
				
			||||||
            </xsl:attribute>
 | 
					 | 
				
			||||||
          </depth>
 | 
					 | 
				
			||||||
        </xsl:when>
 | 
					 | 
				
			||||||
        <xsl:otherwise>
 | 
					 | 
				
			||||||
          <depth>
 | 
					 | 
				
			||||||
            <xsl:attribute name="max">
 | 
					 | 
				
			||||||
              <xsl:call-template name="depthConvert">
 | 
					 | 
				
			||||||
                <xsl:with-param name="depth">
 | 
					 | 
				
			||||||
                  <xsl:value-of select="maxDepth"/>
 | 
					 | 
				
			||||||
                </xsl:with-param>
 | 
					 | 
				
			||||||
                <xsl:with-param name="units" select="$units"/>
 | 
					 | 
				
			||||||
              </xsl:call-template>
 | 
					 | 
				
			||||||
            </xsl:attribute>
 | 
					 | 
				
			||||||
            <xsl:attribute name="mean">
 | 
					 | 
				
			||||||
              <xsl:call-template name="depthConvert">
 | 
					 | 
				
			||||||
                <xsl:with-param name="depth">
 | 
					 | 
				
			||||||
                  <xsl:value-of select="averageDepth"/>
 | 
					 | 
				
			||||||
                </xsl:with-param>
 | 
					 | 
				
			||||||
                <xsl:with-param name="units" select="$units"/>
 | 
					 | 
				
			||||||
              </xsl:call-template>
 | 
					 | 
				
			||||||
            </xsl:attribute>
 | 
					 | 
				
			||||||
          </depth>
 | 
					 | 
				
			||||||
        </xsl:otherwise>
 | 
					 | 
				
			||||||
      </xsl:choose>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      <xsl:variable name="delta">
 | 
					      <xsl:variable name="delta">
 | 
				
			||||||
        <xsl:value-of select="sampleInterval"/>
 | 
					        <xsl:value-of select="sampleInterval"/>
 | 
				
			||||||
      </xsl:variable>
 | 
					      </xsl:variable>
 | 
				
			||||||
| 
						 | 
					@ -175,12 +132,6 @@
 | 
				
			||||||
        <xsl:value-of select="notes"/>
 | 
					        <xsl:value-of select="notes"/>
 | 
				
			||||||
      </notes>
 | 
					      </notes>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      <divecomputer deviceid="ffffffff">
 | 
					 | 
				
			||||||
        <xsl:attribute name="model">
 | 
					 | 
				
			||||||
          <xsl:value-of select="computer"/>
 | 
					 | 
				
			||||||
        </xsl:attribute>
 | 
					 | 
				
			||||||
      </divecomputer>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      <xsl:if test="o2percent != ''">
 | 
					      <xsl:if test="o2percent != ''">
 | 
				
			||||||
        <cylinder>
 | 
					        <cylinder>
 | 
				
			||||||
          <xsl:attribute name="o2">
 | 
					          <xsl:attribute name="o2">
 | 
				
			||||||
| 
						 | 
					@ -243,6 +194,87 @@
 | 
				
			||||||
        </cylinder>
 | 
					        </cylinder>
 | 
				
			||||||
      </xsl:for-each>
 | 
					      </xsl:for-each>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      <xsl:if test="diveMaster">
 | 
				
			||||||
 | 
					        <divemaster>
 | 
				
			||||||
 | 
					          <xsl:value-of select="diveMaster"/>
 | 
				
			||||||
 | 
					        </divemaster>
 | 
				
			||||||
 | 
					      </xsl:if>
 | 
				
			||||||
 | 
					      <buddy>
 | 
				
			||||||
 | 
					        <xsl:for-each select="buddies/buddy">
 | 
				
			||||||
 | 
					          <xsl:choose>
 | 
				
			||||||
 | 
					            <xsl:when test="following-sibling::*[1] != ''">
 | 
				
			||||||
 | 
					              <xsl:value-of select="concat(., ', ')"/>
 | 
				
			||||||
 | 
					            </xsl:when>
 | 
				
			||||||
 | 
					            <xsl:otherwise>
 | 
				
			||||||
 | 
					              <xsl:value-of select="."/>
 | 
				
			||||||
 | 
					            </xsl:otherwise>
 | 
				
			||||||
 | 
					          </xsl:choose>
 | 
				
			||||||
 | 
					        </xsl:for-each>
 | 
				
			||||||
 | 
					      </buddy>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      <xsl:if test="weight != ''">
 | 
				
			||||||
 | 
					        <weightsystem>
 | 
				
			||||||
 | 
					          <xsl:attribute name="weight">
 | 
				
			||||||
 | 
					            <xsl:call-template name="weightConvert">
 | 
				
			||||||
 | 
					              <xsl:with-param name="weight" select="translate(weight, ',', '.')"/>
 | 
				
			||||||
 | 
					              <xsl:with-param name="units" select="$units"/>
 | 
				
			||||||
 | 
					            </xsl:call-template>
 | 
				
			||||||
 | 
					          </xsl:attribute>
 | 
				
			||||||
 | 
					          <xsl:attribute name="description">
 | 
				
			||||||
 | 
					            <xsl:value-of select="'unknown'"/>
 | 
				
			||||||
 | 
					          </xsl:attribute>
 | 
				
			||||||
 | 
					        </weightsystem>
 | 
				
			||||||
 | 
					      </xsl:if>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      <divecomputer deviceid="ffffffff">
 | 
				
			||||||
 | 
					        <xsl:attribute name="model">
 | 
				
			||||||
 | 
					          <xsl:value-of select="computer"/>
 | 
				
			||||||
 | 
					        </xsl:attribute>
 | 
				
			||||||
 | 
					      </divecomputer>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      <xsl:choose>
 | 
				
			||||||
 | 
					        <xsl:when test="maxdepth != ''">
 | 
				
			||||||
 | 
					          <depth>
 | 
				
			||||||
 | 
					            <xsl:attribute name="max">
 | 
				
			||||||
 | 
					              <xsl:call-template name="depthConvert">
 | 
				
			||||||
 | 
					                <xsl:with-param name="depth">
 | 
				
			||||||
 | 
					                  <xsl:value-of select="maxdepth"/>
 | 
				
			||||||
 | 
					                </xsl:with-param>
 | 
				
			||||||
 | 
					                <xsl:with-param name="units" select="$units"/>
 | 
				
			||||||
 | 
					              </xsl:call-template>
 | 
				
			||||||
 | 
					            </xsl:attribute>
 | 
				
			||||||
 | 
					            <xsl:attribute name="mean">
 | 
				
			||||||
 | 
					              <xsl:call-template name="depthConvert">
 | 
				
			||||||
 | 
					                <xsl:with-param name="depth">
 | 
				
			||||||
 | 
					                  <xsl:value-of select="avgdepth"/>
 | 
				
			||||||
 | 
					                </xsl:with-param>
 | 
				
			||||||
 | 
					                <xsl:with-param name="units" select="$units"/>
 | 
				
			||||||
 | 
					              </xsl:call-template>
 | 
				
			||||||
 | 
					            </xsl:attribute>
 | 
				
			||||||
 | 
					          </depth>
 | 
				
			||||||
 | 
					        </xsl:when>
 | 
				
			||||||
 | 
					        <xsl:otherwise>
 | 
				
			||||||
 | 
					          <depth>
 | 
				
			||||||
 | 
					            <xsl:attribute name="max">
 | 
				
			||||||
 | 
					              <xsl:call-template name="depthConvert">
 | 
				
			||||||
 | 
					                <xsl:with-param name="depth">
 | 
				
			||||||
 | 
					                  <xsl:value-of select="maxDepth"/>
 | 
				
			||||||
 | 
					                </xsl:with-param>
 | 
				
			||||||
 | 
					                <xsl:with-param name="units" select="$units"/>
 | 
				
			||||||
 | 
					              </xsl:call-template>
 | 
				
			||||||
 | 
					            </xsl:attribute>
 | 
				
			||||||
 | 
					            <xsl:attribute name="mean">
 | 
				
			||||||
 | 
					              <xsl:call-template name="depthConvert">
 | 
				
			||||||
 | 
					                <xsl:with-param name="depth">
 | 
				
			||||||
 | 
					                  <xsl:value-of select="averageDepth"/>
 | 
				
			||||||
 | 
					                </xsl:with-param>
 | 
				
			||||||
 | 
					                <xsl:with-param name="units" select="$units"/>
 | 
				
			||||||
 | 
					              </xsl:call-template>
 | 
				
			||||||
 | 
					            </xsl:attribute>
 | 
				
			||||||
 | 
					          </depth>
 | 
				
			||||||
 | 
					        </xsl:otherwise>
 | 
				
			||||||
 | 
					      </xsl:choose>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      <temperature>
 | 
					      <temperature>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <!-- If we have temperature reading and it is non-zero, we use
 | 
					        <!-- If we have temperature reading and it is non-zero, we use
 | 
				
			||||||
| 
						 | 
					@ -304,38 +336,6 @@
 | 
				
			||||||
        </xsl:if>
 | 
					        </xsl:if>
 | 
				
			||||||
      </temperature>
 | 
					      </temperature>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      <xsl:if test="diveMaster">
 | 
					 | 
				
			||||||
        <divemaster>
 | 
					 | 
				
			||||||
          <xsl:value-of select="diveMaster"/>
 | 
					 | 
				
			||||||
        </divemaster>
 | 
					 | 
				
			||||||
      </xsl:if>
 | 
					 | 
				
			||||||
      <buddy>
 | 
					 | 
				
			||||||
        <xsl:for-each select="buddies/buddy">
 | 
					 | 
				
			||||||
          <xsl:choose>
 | 
					 | 
				
			||||||
            <xsl:when test="following-sibling::*[1] != ''">
 | 
					 | 
				
			||||||
              <xsl:value-of select="concat(., ', ')"/>
 | 
					 | 
				
			||||||
            </xsl:when>
 | 
					 | 
				
			||||||
            <xsl:otherwise>
 | 
					 | 
				
			||||||
              <xsl:value-of select="."/>
 | 
					 | 
				
			||||||
            </xsl:otherwise>
 | 
					 | 
				
			||||||
          </xsl:choose>
 | 
					 | 
				
			||||||
        </xsl:for-each>
 | 
					 | 
				
			||||||
      </buddy>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      <xsl:if test="weight != ''">
 | 
					 | 
				
			||||||
        <weightsystem>
 | 
					 | 
				
			||||||
          <xsl:attribute name="weight">
 | 
					 | 
				
			||||||
            <xsl:call-template name="weightConvert">
 | 
					 | 
				
			||||||
              <xsl:with-param name="weight" select="translate(weight, ',', '.')"/>
 | 
					 | 
				
			||||||
              <xsl:with-param name="units" select="$units"/>
 | 
					 | 
				
			||||||
            </xsl:call-template>
 | 
					 | 
				
			||||||
          </xsl:attribute>
 | 
					 | 
				
			||||||
          <xsl:attribute name="description">
 | 
					 | 
				
			||||||
            <xsl:value-of select="'unknown'"/>
 | 
					 | 
				
			||||||
          </xsl:attribute>
 | 
					 | 
				
			||||||
        </weightsystem>
 | 
					 | 
				
			||||||
      </xsl:if>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      <xsl:for-each select="samples/sample">
 | 
					      <xsl:for-each select="samples/sample">
 | 
				
			||||||
        <sample>
 | 
					        <sample>
 | 
				
			||||||
          <xsl:attribute name="time">
 | 
					          <xsl:attribute name="time">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue