lenya/src/webapp/lenya/pubs/default publication-sitemap.xmap,1.37,1.38

Update of /repository/lenya/src/webapp/lenya/pubs/default
In directory erbium:/tmp/cvs-serv13437/src/webapp/lenya/pubs/default

Modified Files:
	publication-sitemap.xmap 
Log Message:
* Commented some of the pipelines
* Moved transformations from main pipeline to where they belong.


Index: publication-sitemap.xmap
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/default/publication-sitemap.xmap,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** publication-sitemap.xmap	21 May 2003 16:24:34 -0000	1.37
--- publication-sitemap.xmap	22 May 2003 11:47:36 -0000	1.38
***************
*** 76,87 ****
  
  
! 
      <map:pipeline>
        <map:match pattern="lenyabody/*/*/*/**">
          <map:aggregate element="cmsbody">
! <!--
!           <map:aggregate element="body" prefix="page" ns="http://www.lenya.org/2003/page" label="aggregation">
! -->
! 	    <!-- /lenya.body/{publication-id}/{area}/{doctype}/{document-id} -->
              <map:part src="cocoon://navigation/{1}/{2}/breadcrumb/{4}.xml"/>
              <map:part src="cocoon://navigation/{1}/{2}/tabs/{4}.xml"/>
--- 76,87 ----
  
  
!     <!-- This is the pipeline that builds the page. It aggregates all
!     the navigational elements (breadcrumb, tabs, menu) with the actual
!     content of the document. -->
      <map:pipeline>
+       <!-- /lenyabody/{publication-id}/{area}/{doctype}/{document-id} -->
        <map:match pattern="lenyabody/*/*/*/**">
          <map:aggregate element="cmsbody">
! 	  <!-- <map:aggregate element="body" prefix="page" ns="http://www.lenya.org/2003/page" label="aggregation"> -->
              <map:part src="cocoon://navigation/{1}/{2}/breadcrumb/{4}.xml"/>
              <map:part src="cocoon://navigation/{1}/{2}/tabs/{4}.xml"/>
***************
*** 89,96 ****
--- 89,104 ----
              <map:part src="cocoon://{1}/{2}/{3}/{4}.xml"/>
            </map:aggregate>
+ 	  <map:transform src="xslt/page2xhtml.xsl">
+ 	    <map:parameter name="root" value="{page-envelope:context-prefix}/{1}"/>
+ 	  </map:transform>
          <map:serialize type="xml"/>
        </map:match>
      </map:pipeline>
  
+ 
+     <!-- This is the main entry point into the publication. This
+     pipeline uses the uriparametrizer to determine the doctype of this
+     request. It then aggregates the lenya menu (for the given area) and
+     the lenya body, the actual document. -->
      <map:pipeline>
        <map:match pattern="**.html">
***************
*** 102,112 ****
  	    <map:part src="cocoon:/lenyabody/{page-envelope:publication-id}/{page-envelope:area}/{doctype}/{document-id}"/>
  	  </map:aggregate>
- 	  
- 	  <map:transform src="xslt/page2xhtml.xsl">
- 	    <map:parameter name="root" value="{page-envelope:context-prefix}/{page-envelope:publication-id}"/>
- 	    <map:parameter name="document-id" value="{page-envelope:area}/{doctype}/{document-id}"/>
- 	  </map:transform> 
  	  <map:transform src="xslt/{doctype}-{page-envelope:area}.xsl"/>
- 	  
  	</map:act>
  	<map:serialize type="html"/>
--- 110,114 ----
***************
*** 118,134 ****
        </map:handle-errors>
      </map:pipeline>
- 
-     <!-- Redirect to introduction -->
-     <!-- FIXME: Factor out to root sitemap -->
- <!--
-     <map:pipeline>
-       <map:match pattern="">
-         <map:redirect-to uri="introduction.html"/>
-       </map:match>
-       <map:match pattern="index.html">
-         <map:redirect-to uri="introduction.html"/>
-       </map:match>
-     </map:pipeline>
- -->
  
    </map:pipelines>
--- 120,123 ----