You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by rg...@apache.org on 2005/04/23 01:44:41 UTC
svn commit: r164301 -
/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap
Author: rgardler
Date: Fri Apr 22 16:44:40 2005
New Revision: 164301
URL: http://svn.apache.org/viewcvs?rev=164301&view=rev
Log:
Pass document ID and collection as a request parameter rather than as part of the Forrest URL. This allows te Forrest URL space to be completely independant of the Daisy URL space.
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap?rev=164301&r1=164300&r2=164301&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap Fri Apr 22 16:44:40 2005
@@ -32,21 +32,22 @@
<!-- ============================================================== -->
<map:pipeline>
<map:match
- pattern="do/getRepositoryData/daisy/*/port/*/doc/**.xml">
- <map:generate type="html" src="http://{1}:{2}/{3}?navigationType=none" />
+ pattern="do/getRepositoryData/daisy/*/port/*/collection/*/doc/**.xml">
+ <map:generate type="html" src="http://{1}:{2}/{3}/{4}?navigationType=none" />
<map:transform src="{forrest:stylesheets}/html2document.xsl" />
<map:serialize type="xml" />
</map:match>
+
<map:match
- pattern="do/getRepositoryData/daisy/*/doc/**.xml">
- <map:generate type="html" src="http://{1}/{2}?navigationType=none" />
+ pattern="do/getRepositoryData/daisy/*/collection/*/doc/**.xml">
+ <map:generate type="html" src="http://{1}/{2}/{3}?navigationType=none" />
<map:transform src="{forrest:stylesheets}/html2document.xsl" />
<map:serialize type="xml" />
</map:match>
</map:pipeline>
<map:pipeline>
- <map:match pattern="**.xml">
+ <map:match pattern="*.xml">
<map:select type="exists">
<map:when test="{project:content.xdocs}{0}">
<!-- Do nothing as we want to use the local file -->
@@ -55,9 +56,25 @@
</map:when>
<map:otherwise>
<map:generate type="request"/>
- <map:transform src="resources/stylesheets/repoRequest2doc.xsl">
- <map:parameter name="documentID" value="{1}"/>
- </map:transform>
+ <map:transform src="resources/stylesheets/repoRequest2doc.xsl"/>
+ <map:serialize type="xml" />
+ </map:otherwise>
+ </map:select>
+ </map:match>
+ </map:pipeline>
+
+ <map:pipeline>
+ <map:match pattern="**/*.xml">
+ <map:select type="exists">
+ <map:when test="{project:content.xdocs}{0}">
+ <!-- Do nothing as we want to use the local file -->
+ <!-- FIXME: this requires that this plgin goes last in the processing chain
+ this goeas against the recomendations for building Forrest Plugins.
+ Can we select on the request parameters instead? -->
+ </map:when>
+ <map:otherwise>
+ <map:generate type="request"/>
+ <map:transform src="resources/stylesheets/repoRequest2doc.xsl"/>
<map:serialize type="xml" />
</map:otherwise>
</map:select>