svn commit - mysqldoc@docsrva: r3580 - in trunk: . xsl.d

[paul]

Author: paul
Date: 2006-10-09 19:06:33 +0200 (Mon, 09 Oct 2006)
New Revision: 3580

Log:


Modified:
   trunk/xsl.d/help-prep1.xsl

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:14265
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:10769
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10466
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:14278
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:10769
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10466


Modified: trunk/xsl.d/help-prep1.xsl
===================================================================
--- trunk/xsl.d/help-prep1.xsl	2006-10-09 10:34:30 UTC (rev 3579)
+++ trunk/xsl.d/help-prep1.xsl	2006-10-09 17:06:33 UTC (rev 3580)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 40; 2832 bytes

@@ -337,10 +337,6 @@
   cross-reference points to a section not represented in the help tables,
   so replace it with a URL for its online page. That way, the user can
   visit the referenced page using a web browser.
-  If @linkend points to a node that's not actually a page, it probably
-  points to a <para> or <example> or something similar.  In this case,
-  it's necessary to march up the chain of node ancestors until we find
-  a node that is a page and construct the URL based on the ancestor id.
 -->
 
 <xsl:template match="xref">

@@ -348,48 +344,13 @@
     select="key('toc-elt',@linkend)//remark[@role='help-topic']/@condition"/>
   <xsl:choose>
     <xsl:when test="$topic">
-      <!-- construct [HELP help-topic-value] -->
       <xsl:text>[HELP </xsl:text>
       <xsl:value-of select="$topic"/>
       <xsl:text>]</xsl:text>
     </xsl:when>
     <xsl:otherwise>
-      <!--
-        Construct URL for pointed-to node, or to its nearest ancestor that
-        is a TOC element.  If pointed-to node is a TOC element, use it.
-        Otherwise, check ancestors to find TOC element.
-      -->
-      <xsl:variable name="page-id">
-      <xsl:choose>
-        <xsl:when test="key('toc-elt',@linkend)">
-          <xsl:value-of select="@linkend"/>
-        </xsl:when>
-        <xsl:when test="key('toc-elt',key('id',@linkend)/../@id)">
-          <xsl:value-of select="key('id',@linkend)/../@id"/>
-        </xsl:when>
-        <xsl:when test="key('toc-elt',key('id',@linkend)/../../@id)">
-          <xsl:value-of select="key('id',@linkend)/../../@id"/>
-        </xsl:when>
-        <xsl:when test="key('toc-elt',key('id',@linkend)/../../../@id)">
-          <xsl:value-of select="key('id',@linkend)/../../../@id"/>
-        </xsl:when>
-        <xsl:when test="key('toc-elt',key('id',@linkend)/../../../../@id)">
-          <xsl:value-of select="key('id',@linkend)/../../../../@id"/>
-        </xsl:when>
-        <xsl:when test="key('toc-elt',key('id',@linkend)/../../../../../@id)">
-          <xsl:value-of select="key('id',@linkend)/../../../../../@id"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <!-- if this message ever appears, add new levels above -->
-          <xsl:message terminate="yes">
-            <xsl:text>XREF: DID NOT FIND TOC-ABLE ANCESTOR FOR id=</xsl:text>
-            <xsl:value-of select="@linkend"/>
-          </xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-      </xsl:variable>
       <xsl:value-of select="$doc.url.base"/>
-      <xsl:value-of select="$page-id"/>
+      <xsl:value-of select="@linkend"/>
       <xsl:text>.html</xsl:text>
     </xsl:otherwise>
   </xsl:choose>