Return-Path: <balld@locus.apache.org>
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 9144 invoked by uid 1037); 26 Sep 2000 06:46:08 -0000
Date: 26 Sep 2000 06:46:08 -0000
Message-ID: <20000926064608.9143.qmail@locus.apache.org>
From: balld@locus.apache.org
To: xml-cocoon-cvs@apache.org
Subject: cvs commit:
 xml-cocoon/src/org/apache/cocoon/processor/xsp/library/mail mail.xsl

balld       00/09/25 23:46:06

  Modified:    .        changes.xml
               src/org/apache/cocoon/processor/xsp/library/mail mail.xsl
  Log:
  improvements to mail logicsheet - specifically, now you can retrieve a set of messages by index, you can get the sent date, and some bugs were fixed.
  
  Revision  Changes    Path
  1.115     +4 -1      xml-cocoon/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/changes.xml,v
  retrieving revision 1.114
  retrieving revision 1.115
  diff -u -r1.114 -r1.115
  --- changes.xml	2000/09/22 21:58:54	1.114
  +++ changes.xml	2000/09/26 06:45:59	1.115
  @@ -4,7 +4,7 @@
   
   <!--
     History of Cocoon changes
  -  $Id: changes.xml,v 1.114 2000/09/22 21:58:54 greenrd Exp $
  +  $Id: changes.xml,v 1.115 2000/09/26 06:45:59 balld Exp $
   -->
   
   <changes title="History of Changes">
  @@ -17,6 +17,9 @@
     </devs>
   
    <release version="@version@" date="@date@">
  +  <action dev="DB" type="update" due-to="Ugo Cei" due-to-email="ugo@fuoriorario.it">
  +   improvements to mail logicsheet - specifically, now you can retrieve a set of messages by index, you can get the sent date, and some bugs were fixed.
  +  </action>
     <action dev="RDG" type="update">
      Cleaned up docs, especially how-it-works and FAQ; added new questions
      and answers to FAQ.
  
  
  
  1.3       +48 -13    xml-cocoon/src/org/apache/cocoon/processor/xsp/library/mail/mail.xsl
  
  Index: mail.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/processor/xsp/library/mail/mail.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mail.xsl	2000/09/05 20:13:36	1.2
  +++ mail.xsl	2000/09/26 06:46:04	1.3
  @@ -54,7 +54,8 @@
    </description>
   
    <author>Donald A. Ball Jr.</author>
  - <version>1.0</version>
  + <author>Ugo Cei</author>
  + <version>1.1</version>
   -->
   <xsl:stylesheet
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  @@ -76,6 +77,7 @@
      <xsp:include>javax.mail.Multipart</xsp:include>
      <xsp:include>javax.mail.internet.MimeMessage</xsp:include>
      <xsp:include>javax.mail.internet.MimePart</xsp:include>
  +   <xsp:include>javax.text.DateFormat</xsp:include>
     </xsp:structure>
     <xsl:apply-templates/>
     <xsp:logic>
  @@ -174,18 +176,56 @@
    <xsp:expr>_mail_folder.getMessageCount()</xsp:expr>
   </xsl:template>
   
  -<xsl:template match="mail:results//mail:get-message">
  - <xsl:param name="number"><xsl:value-of select="@number"/></xsl:param>
  - {
  -  MimeMessage _mail_message = (MimeMessage)_mail_folder.getMessage(<xsl:value-of select="@number"/>);
  -  <xsl:apply-templates/>
  - }
  +<xsl:template match="mail:results//mail:get-messages">
  +  <xsl:variable name="start">
  +    <xsl:call-template name="get-nested-string">
  +      <xsl:with-param name="content" select="mail:limit-messages/mail:start-index"/>
  +    </xsl:call-template>
  +  </xsl:variable>
  +  <xsl:variable name="end">
  +    <xsl:call-template name="get-nested-string">
  +      <xsl:with-param name="content" select="mail:limit-messages/mail:end-index"/>
  +    </xsl:call-template>
  +  </xsl:variable>
  +
  +  <xsp:logic>
  +  {
  +    int _mail_start = 1;
  +    int _mail_end = 10; // _mail_folder.getMessageCount();
  +    try {
  +      _mail_start = Integer.parseInt(<xsl:copy-of select="$start"/>); 
  +    } catch (NumberFormatException _mail_exception) {}
  +    if (_mail_start &lt; 1) {
  +      _mail_start = 1;
  +    }
  +    try {
  +      _mail_end = Integer.parseInt(<xsl:copy-of select="$end"/>); 
  +    } catch (NumberFormatException _mail_exception) {}
  +    for (int _mail_i = _mail_start ; 
  +         _mail_i &lt;= _mail_end &amp;&amp; _mail_i &lt;= _mail_folder.getMessageCount() ;
  +         ++_mail_i) {
  +      <message>
  +        <xsp:attribute name="number"><xsp:expr>_mail_i</xsp:expr></xsp:attribute>
  +        <xsp:logic>
  +          MimeMessage _mail_message = (MimeMessage) _mail_folder.getMessage(_mail_i);
  +          if (_mail_message != null) {
  +            <xsl:apply-templates/>
  +	  }
  +        </xsp:logic>
  +      </message>
  +    }
  +  }
  +  </xsp:logic>
   </xsl:template>
   
   <xsl:template match="mail:results//mail:get-message//mail:get-subject">
    <xsp:expr>_mail_message.getSubject()</xsp:expr>
   </xsl:template>
   
  +<xsl:template match="mail:results//mail:get-messages//mail:get-sent-date">
  + <xsp:expr>DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT).format(_mail_message.getSentDate())</xsp:expr>
  +</xsl:template>
  +
   <xsl:template match="mail:results//mail:get-message//mail:get-from">
    <xsp:logic>
     {
  @@ -235,14 +275,9 @@
   
   <xsl:template match="mail:results//mail:get-message//get-content">
    <xsp:logic>
  -  _mail_process_content(_mail_message);
  +  _mail_process_content(request,response,document,xspParentNode,xspCurrentNode,xspNodeStack,session,_mail_message);
    </xsp:logic>
   </xsl:template>
  -
  -<!--
  -<xsl:template match="mail:results//mail:get-message//
  -<xsl:template match="mail:results//mail:get-message//
  --->
   
   <xsl:template match="@*|node()" priority="-1">
    <xsl:copy>