lenya/src/webapp/lenya/pubs/default publication-sitemap.xmap,1.31,1.32

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

Modified Files:
	publication-sitemap.xmap 
Log Message:
* Simplified the publish pipeline by using the request: and the
  request-param: input modules.

* Added a very simple handle-errors to the **.html pipeline which
  gives you a crude window suggesting that you might not have
  published the document.


Index: publication-sitemap.xmap
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/default/publication-sitemap.xmap,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** publication-sitemap.xmap	15 May 2003 09:49:26 -0000	1.31
--- publication-sitemap.xmap	16 May 2003 09:23:36 -0000	1.32
***************
*** 39,49 ****
          </map:match>
          <map:match type="step" pattern="publish">
!           <map:act type="request">
!             <map:parameter name="parameters" value="true"/>
!             <map:act type="task">
!               <map:parameter name="task-id" value="{task-id}"/>
!               <map:redirect-to uri="{parent_uri}" session="true"/>
!             </map:act>
!           </map:act>
          </map:match>
        </map:match>
--- 39,46 ----
          </map:match>
          <map:match type="step" pattern="publish">
! 	  <map:act type="task">
! 	    <map:parameter name="task-id" value="{request-param:task-id}"/>
! 	    <map:redirect-to uri="{request:requestURI}" session="true"/>
! 	  </map:act>
          </map:match>
        </map:match>
***************
*** 159,182 ****
  
      <map:pipeline>
!     <map:match pattern="**.html">
!       <map:act type="page-envelope">
! 	<map:act type="uriparametrizer" src="{../1}.html">
!           <map:parameter name="doctype" value="cocoon://uri-parameter/{publication-id}/doctype"/>
!           <map:parameter name="document-id" value="cocoon://uri-parameter/{publication-id}/document-id"/>
!           <map:aggregate element="lenya" label="aggregation">
!             <map:part src="cocoon:/lenyamenubar/{../area}/article.xml"/>
!             <map:part src="cocoon:/lenyabody/{../publication-id}/{../area}/{doctype}/{document-id}"/>
!           </map:aggregate>
! 
!           <map:transform src="xslt/page2xhtml.xsl">
!             <map:parameter name="root" value="{../context-prefix}/{../publication-id}"/>
!             <map:parameter name="document-id" value="{../area}/{doctype}/{document-id}"/>
!           </map:transform> 
!           <map:transform src="xslt/{doctype}-{../area}.xsl"/>
!           
  	</map:act>
!       </map:act>
!       <map:serialize type="html"/>
!     </map:match>
      </map:pipeline>
  
--- 156,185 ----
  
      <map:pipeline>
!       <map:match pattern="**.html">
! 	<map:act type="page-envelope">
! 	  <map:act type="uriparametrizer" src="{../1}.html">
! 	    <map:parameter name="doctype" value="cocoon://uri-parameter/{publication-id}/doctype"/>
! 	    <map:parameter name="document-id" value="cocoon://uri-parameter/{publication-id}/document-id"/>
! 	    <map:aggregate element="lenya" label="aggregation">
! 	      <map:part src="cocoon:/lenyamenubar/{../area}/article.xml"/>
! 	      <map:part src="cocoon:/lenyabody/{../publication-id}/{../area}/{doctype}/{document-id}"/>
! 	    </map:aggregate>
! 	    
! 	    <map:transform src="xslt/page2xhtml.xsl">
! 	      <map:parameter name="root" value="{../context-prefix}/{../publication-id}"/>
! 	      <map:parameter name="document-id" value="{../area}/{doctype}/{document-id}"/>
! 	    </map:transform> 
! 	    <map:transform src="xslt/{doctype}-{../area}.xsl"/>
! 	    
! 	  </map:act>
  	</map:act>
! 	<map:serialize type="html"/>
!       </map:match>
!       
!       <map:handle-errors type="500">
!         <map:transform src="../../xslt/exception/not_published_yet.xsl"/>
! 	<map:serialize/>
!       </map:handle-errors>
!       
      </map:pipeline>