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 13:17:24 UTC
svn commit: r164372 - in
/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy:
input.xmap src/documentation/content/xdocs/index.xml
Author: rgardler
Date: Sat Apr 23 04:17:23 2005
New Revision: 164372
URL: http://svn.apache.org/viewcvs?rev=164372&view=rev
Log:
use reqeuste-parameter selector to prevent the need to force the plugin to go last in the plugin chain
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml
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=164372&r1=164371&r2=164372&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 Sat Apr 23 04:17:23 2005
@@ -24,6 +24,11 @@
</map:generator>
<map:generator name="request" src="org.apache.cocoon.generation.RequestGenerator"/>
</map:generators>
+
+ <map:selectors>
+ <map:selector logger="sitemap.selector.request-parameter" name="request-parameter" src="org.apache.cocoon.selection.RequestParameterSelector"/>
+ </map:selectors>
+
</map:components>
<map:pipelines>
@@ -48,35 +53,26 @@
<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 -->
- </map:when>
- <map:otherwise>
+ <map:select type="request-parameter">
+ <map:parameter name="parameter-name" value="repositoryType"/>
+ <map:when test="daisy-wiki">
<map:generate type="request"/>
<map:transform src="resources/stylesheets/repoRequest2doc.xsl"/>
<map:serialize type="xml" />
- </map:otherwise>
+ </map:when>
</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:select type="request-parameter">
+ <map:parameter name="parameter-name" value="repositoryType"/>
+ <map:when test="daisy-wiki">
<map:generate type="request"/>
<map:transform src="resources/stylesheets/repoRequest2doc.xsl"/>
<map:serialize type="xml" />
- </map:otherwise>
+ </map:when>
</map:select>
</map:match>
</map:pipeline>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml?rev=164372&r1=164371&r2=164372&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml Sat Apr 23 04:17:23 2005
@@ -56,6 +56,16 @@
<th>Comments</th>
</tr>
<tr>
+ <th>repositoryType</th>
+ <td>The type of repository to access. This indicates how the
+ document is to be retreieved from the repository. At present this
+ can only take the value of dais-wiki, which indicates the document
+ is to be retreived via a daisy Wiki instance. Future versions of
+ this plugin may allow documents to be retrieved directly from the
+ repository server and other plugins may provide support for
+ different repository types.</td>
+ </tr>
+ <tr>
<th>repositoryURL</th>
<td>The URL of the Daisy-Wiki interface to the repository.</td>
</tr>
@@ -81,7 +91,7 @@
<section>
<title>Examples</title>
<ul>
- <li><a href="daisy/index.html?repositoryURL=www.cocoondev.org&repositoryCollection=daisy&documentID=index">Daisy Home Page</a> (retrieved live, you must be online)</li>
+ <li><a href="daisy/index.html?repositoryType=daisy-wiki&repositoryURL=www.cocoondev.org&repositoryCollection=daisy&documentID=index">Daisy Home Page</a> (retrieved live, you must be online)</li>
</ul>
</section>
</section>