bloritsch 00/12/21 12:38:39
Modified: src/org/apache/cocoon/components/language/markup/xsp/java
Tag: xml-cocoon2 esql.xsl xsp.xsl
Log:
Fixed a FIXME
Revision Changes Path
No revision
No revision
1.1.2.13 +5 -10
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/esql.xsl
Index: esql.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/esql.xsl,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- esql.xsl 2000/12/21 19:49:42 1.1.2.12
+++ esql.xsl 2000/12/21 20:38:37 1.1.2.13
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: esql.xsl,v 1.1.2.12 2000/12/21 19:49:42 bloritsch Exp $-->
+<!-- $Id: esql.xsl,v 1.1.2.13 2000/12/21 20:38:37 bloritsch Exp $-->
<!--
============================================================================
@@ -448,18 +448,13 @@
<xsl:template match="esql:results//esql:get-columns">
<xsp:logic>
- xspAttr.clear();
-
for (int esqlI=1; esqlI <=
esqlSession.resultsetMetadata.getColumnCount(); esqlI++) {
String tagName =
esqlSession.resultsetMetadata.getColumnName(esqlI);
-
- //FIXME - we shouldn't rely on the SAX2 objects directly, but
rather use
- //xsp:element, right? but xsp:element requires a static element
name...
- this.contentHandler.startElement("", tagName, tagName, xspAttr);
-
- this.characters(esqlSession.resultset.getString(esqlI));
- this.contentHandler.endElement("", tagName, tagName);
+ <xsp:element>
+ <xsp:param name="name"><xsp:expr>tagName</xsp:expr></xsp:param>
+
<xsp:text><xsp:expr>esqlSession.resultset.getString(esqlI)</xsp:expr></xsp:text>
+ </xsp:element>
}
this.characters("\n");
1.1.2.13 +47 -48
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/xsp.xsl
Index: xsp.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/xsp.xsl,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- xsp.xsl 2000/12/20 19:33:50 1.1.2.12
+++ xsp.xsl 2000/12/21 20:38:38 1.1.2.13
@@ -11,7 +11,7 @@
<!--
* @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2000/12/20 19:33:50 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2000/12/21 20:38:38 $
-->
<!-- XSP Core logicsheet for the Java language -->
@@ -68,55 +68,54 @@
* Generated by XSP. Edit at your own risk, :-)
*/
public class <xsl:value-of select="@file-name"/> extends XSPGenerator {
- Logger log = null;
- Logger cocoonLogger = LogKit.getLoggerFor("cocoon");
+ Logger log = null;
+ Logger cocoonLogger = LogKit.getLoggerFor("cocoon");
- static {
- dateCreated = <xsl:value-of select="@creation-date"/>L;
- dependencies = new File[] {
- <xsl:for-each select="xsp:dependency">
- new File("<xsl:value-of select="translate(., '\','/')"/>"),
- </xsl:for-each>
- };
- }
-
- /* User Class Declarations */
- <xsl:apply-templates select="xsp:logic"/>
-
- /**
- * Generate XML data.
- */
- public void generate() throws SAXException {
- this.contentHandler.startDocument();
- AttributesImpl xspAttr = new AttributesImpl();
-
- <!-- Generate top-level processing instructions -->
- <xsl:apply-templates select="/processing-instruction()"/>
-
- <!-- Start top-level namespace prefix mapping -->
- <xsl:for-each select="namespace::*[not(local-name(.) = 'xsp')]">
- this.contentHandler.startPrefixMapping(
- "<xsl:value-of select="local-name(.)"/>",
- "<xsl:value-of select="."/>"
- );
- </xsl:for-each>
-
- <!-- Process only 1st non-XSP element as generated root -->
- <xsl:call-template name="process-first-element">
- <xsl:with-param
- name="content"
- select="*[not(starts-with(name(.), 'xsp:'))]"/>
- </xsl:call-template>
-
- <!-- End top-level namespace prefix mapping -->
- <xsl:for-each select="namespace::*[not(local-name(.) = 'xsp')]">
- this.contentHandler.endPrefixMapping(
- "<xsl:value-of select="local-name(.)"/>"
- );
- </xsl:for-each>
+ static {
+ dateCreated = <xsl:value-of select="@creation-date"/>L;
+ dependencies = new File[] {
+ <xsl:for-each select="xsp:dependency">
+ new File("<xsl:value-of select="translate(., '\','/')"/>"),
+ </xsl:for-each>
+ };
+ }
+
+ /* User Class Declarations */
+ <xsl:apply-templates select="xsp:logic"/>
+
+ /**
+ * Generate XML data.
+ */
+ public void generate() throws SAXException {
+ this.contentHandler.startDocument();
+ AttributesImpl xspAttr = new AttributesImpl();
+
+ <!-- Generate top-level processing instructions -->
+ <xsl:apply-templates select="/processing-instruction()"/>
+
+ <!-- Start top-level namespace prefix mapping -->
+ <xsl:for-each select="namespace::*[not(local-name(.) = 'xsp')]">
+ this.contentHandler.startPrefixMapping(
+ "<xsl:value-of select="local-name(.)"/>",
+ "<xsl:value-of select="."/>"
+ );
+ </xsl:for-each>
+
+ <!-- Process only 1st non-XSP element as generated root -->
+ <xsl:call-template name="process-first-element">
+ <xsl:with-param name="content"
+ select="*[not(starts-with(name(.), 'xsp:'))]"/>
+ </xsl:call-template>
+
+ <!-- End top-level namespace prefix mapping -->
+ <xsl:for-each select="namespace::*[not(local-name(.) = 'xsp')]">
+ this.contentHandler.endPrefixMapping(
+ "<xsl:value-of select="local-name(.)"/>"
+ );
+ </xsl:for-each>
- this.contentHandler.endDocument();
- }
+ this.contentHandler.endDocument();
+ }
}
</xsl:template>
