rubys 01/09/18 09:27:46
Modified: proposal/gump gen.java
proposal/gump/stylesheet bash.xsl win2k.xsl
Log:
Attempt to more property resolve the source file a given xml was
defined-in (don't simply assume module name matches source file name).
Revision Changes Path
1.11 +6 -3 jakarta-alexandria/proposal/gump/gen.java
Index: gen.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/gen.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gen.java 2001/08/28 16:15:38 1.10
+++ gen.java 2001/09/18 16:27:46 1.11
@@ -113,6 +113,7 @@
Element parent = (Element)node.getParentNode();
if (node.getNodeName().equals("profile")) {
+ copy.removeAttribute("defined-in");
copyChildren(copy, parent);
} else {
parent.replaceChild(copy,node);
@@ -142,12 +143,12 @@
NodeIterator nl = XPathAPI.selectNodeIterator(document, "//"+type);
for (Node child=nl.nextNode(); child!=null; child=nl.nextNode()) {
Element element = (Element) child;
- String name = element.getAttributeNode("name").getValue();
+ String name = element.getAttribute("name");
Element priorDefinition = (Element)list.get(name);
if (priorDefinition != null && priorDefinition != element) {
Element parent = (Element)priorDefinition.getParentNode();
- String definedIn = parent.getAttribute("name");
+ String definedIn = parent.getAttribute("defined-in");
if (!definedIn.equals(""))
element.setAttribute("defined-in",definedIn);
copyChildren(priorDefinition, element);
@@ -176,7 +177,9 @@
Element parent = (Element)element.getParentNode();
if (parent != root) {
parent.removeChild(element);
- String definedIn = parent.getAttributeNode("name").getValue();
+ String definedIn = parent.getAttribute("defined-in");
+ if (definedIn.equals(""))
+ definedIn = parent.getAttribute("name");
element.setAttribute("defined-in",definedIn);
root.appendChild(element);
}
1.35 +11 -9 jakarta-alexandria/proposal/gump/stylesheet/bash.xsl
Index: bash.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/bash.xsl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- bash.xsl 2001/09/05 21:14:03 1.34
+++ bash.xsl 2001/09/18 16:27:46 1.35
@@ -189,15 +189,17 @@
<xsl:for-each select="project">
<xsl:sort select="@defined-in"/>
- <xsl:variable name="defined-in" select="@defined-in"/>
- <xsl:if test="not(preceding::project[@defined-in=$defined-in])">
- <xsl:text>bash publish.sh project/</xsl:text>
- <xsl:value-of select="@defined-in"/>
- <xsl:text>.xml </xsl:text>
- <xsl:value-of select="$basedir"/>
- <xsl:text>/log/project_</xsl:text>
- <xsl:value-of select="@defined-in"/>
- <xsl:text>.html </xsl:text>
+ <xsl:if test="defined-in">
+ <xsl:variable name="defined-in" select="@defined-in"/>
+ <xsl:if test="not(preceding::project[@defined-in=$defined-in])">
+ <xsl:text>bash publish.sh project/</xsl:text>
+ <xsl:value-of select="@defined-in"/>
+ <xsl:text>.xml </xsl:text>
+ <xsl:value-of select="$basedir"/>
+ <xsl:text>/log/project_</xsl:text>
+ <xsl:value-of select="@defined-in"/>
+ <xsl:text>.html </xsl:text>
+ </xsl:if>
</xsl:if>
</xsl:for-each>
1.12 +11 -9 jakarta-alexandria/proposal/gump/stylesheet/win2k.xsl
Index: win2k.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/stylesheet/win2k.xsl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- win2k.xsl 2001/09/05 21:02:02 1.11
+++ win2k.xsl 2001/09/18 16:27:46 1.12
@@ -158,15 +158,17 @@
<xsl:for-each select="project">
<xsl:sort select="@defined-in"/>
- <xsl:variable name="defined-in" select="@defined-in"/>
- <xsl:if test="not(preceding::project[@defined-in=$defined-in])">
- <xsl:text>call publish project\</xsl:text>
- <xsl:value-of select="@defined-in"/>
- <xsl:text>.xml </xsl:text>
- <xsl:value-of select="$basedir"/>
- <xsl:text>\log\project_</xsl:text>
- <xsl:value-of select="@defined-in"/>
- <xsl:text>.html </xsl:text>
+ <xsl:if test="@defined-in">
+ <xsl:variable name="defined-in" select="@defined-in"/>
+ <xsl:if test="not(preceding::project[@defined-in=$defined-in])">
+ <xsl:text>call publish project\</xsl:text>
+ <xsl:value-of select="@defined-in"/>
+ <xsl:text>.xml </xsl:text>
+ <xsl:value-of select="$basedir"/>
+ <xsl:text>\log\project_</xsl:text>
+ <xsl:value-of select="@defined-in"/>
+ <xsl:text>.html </xsl:text>
+ </xsl:if>
</xsl:if>
</xsl:for-each>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
