giacomo     01/05/10 15:24:28

  Modified:    src/org/apache/cocoon/components/language/markup/xsp
                        XSPRequestHelper.java
               src/org/apache/cocoon/components/language/markup/xsp/java
                        request.xsl
  Log:
  Added getSitemapURI method/tag
  
  Revision  Changes    Path
  1.2       +12 -1     
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java
  
  Index: XSPRequestHelper.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XSPRequestHelper.java     2001/05/09 20:49:52     1.1
  +++ XSPRequestHelper.java     2001/05/10 22:24:25     1.2
  @@ -21,7 +21,7 @@
    * The <code>Request</code> object helper
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:52 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 22:24:25 $
    */
   public class XSPRequestHelper extends XSPObjectHelper {
     /**
  @@ -84,6 +84,17 @@
     public static String getSitemapURI(Map objectModel) {
       Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
       return request.getSitemapURI();
  +  }
  +
  +  /**
  +   * Outputs the sitemap uri associated with the given objectModel
  +   *
  +   * @param objectModel the Map objectModel
  +   */
  +  public static void getSitemapURI(Map objectModel, ContentHandler handler)
  +      throws SAXException {
  +    Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
  +    elementData(handler, "sitemap-uri", getSitemapURI(objectModel));
     }
   
     /**
  
  
  
  1.2       +23 -1     
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/request.xsl
  
  Index: request.xsl
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/request.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- request.xsl       2001/05/09 20:49:54     1.1
  +++ request.xsl       2001/05/10 22:24:27     1.2
  @@ -11,7 +11,7 @@
   
   <!--
    * @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:54 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 22:24:27 $
   -->
   
   <!-- XSP Request logicsheet for the Java language -->
  @@ -39,6 +39,28 @@
       <!-- <xsp-request:uri> -->
           <xsp:logic>
             XSPRequestHelper.getURI(objectModel, this.contentHandler);
  +        </xsp:logic>
  +      </xsl:when>
  +    </xsl:choose>
  +  </xsl:template>
  +
  +  <xsl:template match="xsp-request:get-sitemap-uri">
  +    <xsl:variable name="as">
  +      <xsl:call-template name="value-for-as">
  +        <xsl:with-param name="default" select="'string'"/>
  +      </xsl:call-template>
  +    </xsl:variable>
  +
  +    <xsl:choose>
  +      <xsl:when test="$as = 'string'">
  +        <xsp:expr>
  +          (XSPRequestHelper.getSitemapURI(objectModel))
  +        </xsp:expr>
  +      </xsl:when>
  +      <xsl:when test="$as = 'xml'">
  +    <!-- <xsp-request:uri> -->
  +        <xsp:logic>
  +          XSPRequestHelper.getSitemapURI(objectModel, this.contentHandler);
           </xsp:logic>
         </xsl:when>
       </xsl:choose>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to