[nst-cvs] include/xsl nsttraceroute2kml.xsl,1.14,1.15

[Paul B. <pbl...@us...>]

Update of /cvsroot/nst/include/xsl
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5941/include/xsl

Modified Files:
	nsttraceroute2kml.xsl 
Log Message:
Cleaned up individual tables (at each node)


Index: nsttraceroute2kml.xsl
===================================================================
RCS file: /cvsroot/nst/include/xsl/nsttraceroute2kml.xsl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** nsttraceroute2kml.xsl	30 Jan 2009 00:50:28 -0000	1.14
--- nsttraceroute2kml.xsl	30 Jan 2009 13:11:19 -0000	1.15
***************
*** 378,415 ****
            <tr>
              <th align="left">Address</th>
!             <td>]]>
!             <!-- Display as: "FQDN (ADDR)" or just "ADDR" if no FQDN -->
!             <xsl:choose>
!               <xsl:when test="/nsttraceroute/info/resolvefqdn = 'true'">
!                 <xsl:value-of select="fqdn" />
!                 <xsl:text> (</xsl:text>
!                 <xsl:value-of select="gwaddr" />
!                 <xsl:text>)</xsl:text>
!               </xsl:when>
!               <xsl:otherwise>
!                 <xsl:value-of select="gwaddr" />
!               </xsl:otherwise>
!             </xsl:choose>
!             <![CDATA[</td>
!           </tr>
!           <tr>
!             <th align="left">Delay</th>
!             <td>]]><xsl:value-of select="@show" /><![CDATA[</td>
            </tr>
            <tr>
              <th align="left">Hop</th>
!             <td>]]><xsl:value-of select="../@value" /><![CDATA[</td>
            </tr>
            <tr>
              <th align="left">Latitude</th>
!             <td>]]><xsl:call-template name="getLat">
                <xsl:with-param name="ipAddr" select="gwaddr" />
!             </xsl:call-template><![CDATA[</td>
            </tr>
            <tr>
              <th align="left">Longitude</th>
!             <td>]]><xsl:call-template name="getLon">
                <xsl:with-param name="ipAddr" select="gwaddr" />
!             </xsl:call-template><![CDATA[</td>
            </tr>
          </table>]]>
--- 378,404 ----
            <tr>
              <th align="left">Address</th>
!             <td><pre>]]><!-- Display as: "FQDN (ADDR)" or just "ADDR" if no FQDN --><xsl:choose><xsl:when test="/nsttraceroute/info/resolvefqdn = 'true'"><xsl:value-of select="fqdn" /><xsl:text> (</xsl:text><xsl:value-of select="gwaddr" /><xsl:text>)</xsl:text></xsl:when><xsl:otherwise><xsl:value-of select="gwaddr" /></xsl:otherwise></xsl:choose><![CDATA[</pre></td>
!           </tr>]]><xsl:if test="../@value = '0'"><![CDATA[<tr>
!             <th align="left">Public</th>
!             <td><pre>]]><!-- Display as: "FQDN (ADDR)" or just "ADDR" if no FQDN --><xsl:choose><xsl:when test="/nsttraceroute/info/resolvefqdn = 'true'"><xsl:value-of select="/nsttraceroute/info/pubaddrfqdn" /><xsl:text> (</xsl:text><xsl:value-of select="/nsttraceroute/info/pubaddr" /><xsl:text>)</xsl:text></xsl:when><xsl:otherwise><xsl:value-of select="/nsttraceroute/info/pubaddr" /></xsl:otherwise></xsl:choose><![CDATA[</pre></td>
!           </tr>]]></xsl:if><![CDATA[<tr>
!             <th align="left">Roundtrip</th>
!             <td><pre>]]><xsl:value-of select="@show" /><![CDATA[</pre></td>
            </tr>
            <tr>
              <th align="left">Hop</th>
!             <td><pre>]]><xsl:value-of select="../@value" /><![CDATA[</pre></td>
            </tr>
            <tr>
              <th align="left">Latitude</th>
!             <td><pre>]]><xsl:call-template name="getLat">
                <xsl:with-param name="ipAddr" select="gwaddr" />
!             </xsl:call-template><![CDATA[</pre></td>
            </tr>
            <tr>
              <th align="left">Longitude</th>
!             <td><pre>]]><xsl:call-template name="getLon">
                <xsl:with-param name="ipAddr" select="gwaddr" />
!             </xsl:call-template><![CDATA[</pre></td>
            </tr>
          </table>]]>