xsddoc/src/net/sf/xframe/xsddoc/xslt schema-summary.xsl,1.9,1.10 overview-namespaces.xsl,1.9,1.10

Update of /cvsroot/xframe/xsddoc/src/net/sf/xframe/xsddoc/xslt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30974/src/net/sf/xframe/xsddoc/xslt

Modified Files:
	schema-summary.xsl overview-namespaces.xsl 
Log Message:
fixed a bug: namespaces imported from redefined schema not linked in overview pages

Index: overview-namespaces.xsl
===================================================================
RCS file: /cvsroot/xframe/xsddoc/src/net/sf/xframe/xsddoc/xslt/overview-namespaces.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** overview-namespaces.xsl	10 Jun 2004 18:54:24 -0000	1.9
--- overview-namespaces.xsl	15 Dec 2004 14:05:47 -0000	1.10
***************
*** 81,84 ****
--- 81,106 ----
    <!--
    -->
+   <xsl:template match="xs:include | xs:redefine" mode="schema-summary">
+     <xsl:param name="processedLocations"/>
+     <xsl:variable name="schemaLocation" select="@schemaLocation"/>
+     <xsl:if test="not(contains($processedLocations, $schemaLocation))">
+       <xsl:apply-templates select="document($schemaLocation)/xs:schema" mode="schema-summary">
+         <xsl:with-param name="processedLocations" select="concat($processedLocations, ' ', $schemaLocation)"/>
+       </xsl:apply-templates>
+     </xsl:if>
+   </xsl:template>
+   <!--
+   -->
+   <xsl:template match="xs:import" mode="schema-summary">
+     <xsl:param name="processedLocations"/>
+     <xsl:variable name="schemaLocation" select="@schemaLocation"/>
+     <xsl:if test="not(contains($processedLocations, $schemaLocation))">
+       <xsl:apply-templates select="document($schemaLocation)/xs:schema" mode="schema-summary">
+         <xsl:with-param name="processedLocations" select="concat($processedLocations, ' ', $schemaLocation)"/>
+       </xsl:apply-templates>
+     </xsl:if>
+   </xsl:template>
+   <!--
+   -->
    <xsl:template match="xs:schema" mode="targetNamespace">
      <doc:namespace name="{@targetNamespace}">
***************
*** 91,115 ****
      </doc:namespace>
    </xsl:template>
-   <!--
-   -->
-   <xsl:template match="xs:include | xs:redefine" mode="schema-summary">
-     <xsl:param name="processedLocations" select="/xs:schema/@targetNamespace"/>
-     <xsl:for-each select="document(@schemaLocation)/xs:schema">
-       <xsl:if test="not(contains($processedLocations, @schemaLocation))">
-         <xsl:apply-templates select="xs:include | xs:redefine | xs:import" mode="schema-summary">
-           <xsl:with-param name="processedLocations" select="concat($processedLocations, ' ', @schemaLocation)"/>
-         </xsl:apply-templates>
-       </xsl:if>
-     </xsl:for-each>
-   </xsl:template>
-   <!--
-   -->
-   <xsl:template match="xs:import" mode="schema-summary">
-     <xsl:param name="processedLocations" select="/xs:schema/@targetNamespace"/>
-     <xsl:if test="not(contains($processedLocations, @schemaLocation))">
-       <xsl:apply-templates select="document(@schemaLocation)/xs:schema" mode="schema-summary">
-         <xsl:with-param name="processedLocations" select="concat($processedLocations, ' ', @schemaLocation)"/>
-       </xsl:apply-templates>
-     </xsl:if>
-   </xsl:template>
  </xsl:stylesheet>
--- 113,115 ----

Index: schema-summary.xsl
===================================================================
RCS file: /cvsroot/xframe/xsddoc/src/net/sf/xframe/xsddoc/xslt/schema-summary.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** schema-summary.xsl	10 Jun 2004 18:54:24 -0000	1.9
--- schema-summary.xsl	15 Dec 2004 14:05:47 -0000	1.10
***************
*** 92,95 ****
--- 92,117 ----
    <!--
    -->
+   <xsl:template match="xs:include | xs:redefine" mode="schema-summary">
+     <xsl:param name="processedLocations"/>
+     <xsl:variable name="schemaLocation" select="@schemaLocation"/>
+     <xsl:if test="not(contains($processedLocations, $schemaLocation))">
+       <xsl:apply-templates select="document($schemaLocation)/xs:schema" mode="schema-summary">
+         <xsl:with-param name="processedLocations" select="concat($processedLocations, ' ', $schemaLocation)"/>
+       </xsl:apply-templates>
+     </xsl:if>
+   </xsl:template>
+   <!--
+   -->
+   <xsl:template match="xs:import" mode="schema-summary">
+     <xsl:param name="processedLocations"/>
+     <xsl:variable name="schemaLocation" select="@schemaLocation"/>
+     <xsl:if test="not(contains($processedLocations, $schemaLocation))">
+       <xsl:apply-templates select="document($schemaLocation)/xs:schema" mode="schema-summary">
+         <xsl:with-param name="processedLocations" select="concat($processedLocations, ' ', $schemaLocation)"/>
+       </xsl:apply-templates>
+     </xsl:if>
+   </xsl:template>
+   <!--
+   -->
    <xsl:template match="xs:schema" mode="targetNamespace">
      <doc:namespace name="{@targetNamespace}">
***************
*** 109,133 ****
      </doc:namespace>
    </xsl:template>
-   <!--
-   -->
-   <xsl:template match="xs:include | xs:redefine" mode="schema-summary">
-     <xsl:param name="processedLocations" select="$schemaLocation"/>
-     <xsl:for-each select="document(@schemaLocation)/xs:schema">
-       <xsl:if test="not(contains($processedLocations, @schemaLocation))">
-         <xsl:apply-templates select="xs:include | xs:redefine | xs:import" mode="schema-summary">
-           <xsl:with-param name="processedLocations" select="concat($processedLocations, ' ', @schemaLocation)"/>
-         </xsl:apply-templates>
-       </xsl:if>
-     </xsl:for-each>
-   </xsl:template>
-   <!--
-   -->
-   <xsl:template match="xs:import" mode="schema-summary">
-     <xsl:param name="processedLocations" select="$schemaLocation"/>
-     <xsl:if test="not(contains($processedLocations, @schemaLocation))">
-       <xsl:apply-templates select="document(@schemaLocation)/xs:schema" mode="schema-summary">
-         <xsl:with-param name="processedLocations" select="concat($processedLocations, ' ', @schemaLocation)"/>
-       </xsl:apply-templates>
-     </xsl:if>
-   </xsl:template>
  </xsl:stylesheet>
--- 131,133 ----



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now. 
http://productguide.itmanagersjournal.com/