You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2003/10/26 18:28:25 UTC
cvs commit: cocoon-lenya/src/webapp/lenya scheduler.xmap usecase.xmap
andreas 2003/10/26 09:28:25
Modified: src/webapp/lenya scheduler.xmap usecase.xmap
Log:
redesigned scheduler interface
Revision Changes Path
1.6 +11 -1 cocoon-lenya/src/webapp/lenya/scheduler.xmap
Index: scheduler.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/scheduler.xmap,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scheduler.xmap 18 Sep 2003 17:08:29 -0000 1.5
+++ scheduler.xmap 26 Oct 2003 17:28:25 -0000 1.6
@@ -64,18 +64,28 @@
<map:match pattern="document/*/**">
<map:generate src="cocoon:/publication/{1}"/>
<map:transform src="xslt/scheduler/filter-document.xsl">
- <map:parameter name="document-url" value="/{1}/{2}"/>
+ <map:parameter name="documenturl" value="/{1}/{2}"/>
</map:transform>
<map:serialize type="xml"/>
</map:match>
+ <!--
+ About the initialreferer parameter:
+ When the page is called the for first time, the initialreferer
+ parameter value is used. For subsequent requests, the value
+ of the request parameter "referer" is used. This way, it is
+ avoided that all query strings are appended.
+ -->
+
<!-- {publication-id}/{area-document-url}.xsl -->
<map:match pattern="*/**.xsl">
<map:generate src="cocoon:/document/{1}/{2}"/>
<map:transform src="xslt/scheduler/jobs2xslt.xsl">
+ <map:parameter name="use-request-parameters" value="true"/>
<map:parameter name="contextpath" value="{request:contextPath}"/>
<map:parameter name="documenturl" value="{page-envelope:document-url}"/>
<map:parameter name="publicationid" value="{page-envelope:publication-id}"/>
+ <map:parameter name="initialreferer" value="{request:requestURI}?{request:queryString}"/>
</map:transform>
<map:serialize type="xml"/>
</map:match>
1.124 +6 -5 cocoon-lenya/src/webapp/lenya/usecase.xmap
Index: usecase.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/usecase.xmap,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- usecase.xmap 23 Oct 2003 17:52:07 -0000 1.123
+++ usecase.xmap 26 Oct 2003 17:28:25 -0000 1.124
@@ -152,6 +152,7 @@
<!-- show scheduler screen -->
<map:match pattern="showscreen" type="step">
<map:generate src="cocoon://scheduler/publication/{../../1}"/>
+ <map:serialize type="xml"/>
<map:transform src="xslt/scheduler/scheduler-page.xsl">
<map:parameter name="context-prefix" value="{request:contextPath}"/>
<map:parameter name="publication-id" value="{../../1}"/>
@@ -164,12 +165,12 @@
<!-- other steps: add job (redirect to page) -->
<map:generate src="cocoon://scheduler/publication/{../1}"/>
<map:transform src="xslt/util/redirect.xsl">
- <map:parameter name="url" value="{request:requestURI}"/>
+ <map:parameter name="url" value="{request-param:referer}"/>
</map:transform>
<map:serialize/>
</map:match>
-
+
<!-- usecase -->
<!-- View Logs -->
<map:match pattern="view-logs" type="usecase">
@@ -240,7 +241,7 @@
<map:parameter name="stylesheet" value="publishing/publish-screen.xsl"/>
</map:call>
<map:transform src="cocoon:/notification/{../../1}/publish.xsl"/>
- <map:transform src="cocoon://scheduler/{../../1}/{../../2}/{../../3}.xsl"/>
+ <map:transform src="cocoon://scheduler/{../../1}/{page-envelope:area}/{../../3}.xsl"/>
<map:call resource="style-cms-page"/>
</map:match>
@@ -629,7 +630,7 @@
<map:match pattern="archive" type="step">
<map:act type="task">
- <map:redirect-to session="true" uri="{request:contextPath}/{../../../1}/{../../../2}/"/>
+ <map:redirect-to session="true" uri=".."/>
</map:act>
</map:match>
@@ -730,7 +731,7 @@
<map:match pattern="delete" type="step">
<map:act type="task">
- <map:redirect-to session="true" uri="{request:contextPath}/{../../../1}/{../../../2}/"/>
+ <map:redirect-to session="true" uri=".."/>
</map:act>
</map:match>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org