vgritsenko 02/03/01 07:21:24
Modified: src/java/org/apache/cocoon/components/language/markup/xsp/java
session.xsl
src/java/org/apache/cocoon/components/language/markup/xsp/javascript
session.xsl
Log:
set default for xsp-session:set-attribute@default to null, default for @interval to 0
Revision Changes Path
1.12 +13 -6
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/session.xsl
Index: session.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/session.xsl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- session.xsl 28 Feb 2002 14:41:07 -0000 1.11
+++ session.xsl 1 Mar 2002 15:21:24 -0000 1.12
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!-- $Id: session.xsl,v 1.11 2002/02/28 14:41:07 vgritsenko Exp $-->
+<!-- $Id: session.xsl,v 1.12 2002/03/01 15:21:24 vgritsenko Exp $-->
<!--
============================================================================
@@ -56,7 +56,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
* @author ported by <a href="mailto:[EMAIL PROTECTED]>Berin Loritsch</a>
- * @version CVS $Revision: 1.11 $ $Date: 2002/02/28 14:41:07 $
+ * @version CVS $Revision: 1.12 $ $Date: 2002/03/01 15:21:24 $
-->
<xsl:stylesheet version="1.0"
@@ -97,8 +97,15 @@
</xsl:call-template>
</xsl:variable>
<xsl:variable name="default">
- <xsl:call-template name="value-for-default">
- </xsl:call-template>
+ <xsl:choose>
+ <xsl:when test="@default">"<xsl:value-of select="@default"/>"</xsl:when>
+ <xsl:when test="xsp-session:default">
+ <xsl:call-template name="get-nested-content">
+ <xsl:with-param name="content" select="xsp-session:default"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>null</xsl:otherwise>
+ </xsl:choose>
</xsl:variable>
<xsl:choose>
<xsl:when test="$as = 'xml'">
@@ -306,13 +313,13 @@
<xsl:template match="xsp-session:set-max-inactive-interval">
<xsl:variable name="interval">
<xsl:choose>
- <xsl:when test="@interval">"<xsl:value-of
- select="@interval"/>"</xsl:when>
+ <xsl:when test="@interval">"<xsl:value-of select="@interval"/>"</xsl:when>
<xsl:when test="xsp-session:interval">
<xsl:call-template name="get-nested-content">
<xsl:with-param name="content" select="xsp-session:interval"/>
</xsl:call-template>
</xsl:when>
+ <xsl:otherwise>0</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsp:logic>
1.2 +13 -6
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/javascript/session.xsl
Index: session.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/javascript/session.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- session.xsl 28 Feb 2002 14:53:41 -0000 1.1
+++ session.xsl 1 Mar 2002 15:21:24 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!-- $Id: session.xsl,v 1.1 2002/02/28 14:53:41 vgritsenko Exp $-->
+<!-- $Id: session.xsl,v 1.2 2002/03/01 15:21:24 vgritsenko Exp $-->
<!--
============================================================================
@@ -57,7 +57,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
* @author ported by <a href="mailto:[EMAIL PROTECTED]>Berin Loritsch</a>
* @author ported by <a href="mailto:[EMAIL PROTECTED]>Vadim Gritsenko</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/02/28 14:53:41 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/03/01 15:21:24 $
-->
<xsl:stylesheet version="1.0"
@@ -100,8 +100,15 @@
</xsl:call-template>
</xsl:variable>
<xsl:variable name="default">
- <xsl:call-template name="value-for-default">
- </xsl:call-template>
+ <xsl:choose>
+ <xsl:when test="@default">"<xsl:value-of select="@default"/>"</xsl:when>
+ <xsl:when test="xsp-session:default">
+ <xsl:call-template name="get-nested-content">
+ <xsl:with-param name="content" select="xsp-session:default"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>null</xsl:otherwise>
+ </xsl:choose>
</xsl:variable>
<xsl:choose>
<xsl:when test="$as = 'xml'">
@@ -310,13 +317,13 @@
<xsl:template match="xsp-session:set-max-inactive-interval">
<xsl:variable name="interval">
<xsl:choose>
- <xsl:when test="@interval">"<xsl:value-of
- select="@interval"/>"</xsl:when>
+ <xsl:when test="@interval">"<xsl:value-of select="@interval"/>"</xsl:when>
<xsl:when test="xsp-session:interval">
<xsl:call-template name="get-nested-content">
<xsl:with-param name="content" select="xsp-session:interval"/>
</xsl:call-template>
</xsl:when>
+ <xsl:otherwise>0</xsl:otherwise>
</xsl:choose>
</xsl:variable>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
