Return-Path: 
 <svn-return-2426-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 9553 invoked from network); 27 May 2005 12:13:53 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 27 May 2005 12:13:53 -0000
Received: (qmail 8900 invoked by uid 500); 27 May 2005 12:13:39 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 8811 invoked by uid 500); 27 May 2005 12:13:39 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 8780 invoked by uid 99); 27 May 2005 12:13:39 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Fri, 27 May 2005 05:13:35 -0700
Received: (qmail 9273 invoked by uid 65534); 27 May 2005 12:13:16 -0000
Message-ID: <20050527121316.9272.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r178772 - in
 /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy:
 input.xmap resources/stylesheets/repoRequest2doc.xsl
 src/documentation/content/xdocs/index.xml
Date: Fri, 27 May 2005 12:13:15 -0000
To: svn@forrest.apache.org
From: rgardler@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: rgardler
Date: Fri May 27 05:13:13 2005
New Revision: 178772

URL: http://svn.apache.org/viewcvs?rev=3D178772&view=3Drev
Log:
Provide pre and post filters and allow the tretrieval of unprocessed conten=
t=2E Add warning that the source format will later change to the daisy XML =
document rather than the HTML document it currently is.

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/=
input.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/=
resources/stylesheets/repoRequest2doc.xsl
    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.apa=
che.forrest.plugin.input.Daisy/input.xmap?rev=3D178772&r1=3D178771&r2=3D178=
772&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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 May 27 05:13:13 2005
@@ -37,18 +37,32 @@
 		<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
 		<map:pipeline>
 			<map:match
+				pattern=3D"do/getRepositoryData/daisy/*/port/*/collection/*/doc/**.sou=
rce.xml">
+				<map:generate type=3D"html" src=3D"http://{1}:{2}/{3}/{4}?navigationTy=
pe=3Dnone" />
+				<map:serialize type=3D"xml" />
+			</map:match>
+     =20
+			<map:match
 				pattern=3D"do/getRepositoryData/daisy/*/port/*/collection/*/doc/**.xml=
">
 				<map:generate type=3D"html" src=3D"http://{1}:{2}/{3}/{4}?navigationTy=
pe=3Dnone" />
-        <map:transform src=3D"{project:resources.stylesheets}/daisyFilter.=
xsl"/>
+        <map:transform src=3D"{project:resources.stylesheets}/daisy/preFil=
ter.xsl"/>
 				<map:transform src=3D"{forrest:stylesheets}/html2document.xsl" />
+        <map:transform src=3D"{project:resources.stylesheets}/daisy/postFi=
lter.xsl"/>
+				<map:serialize type=3D"xml" />
+			</map:match>
+     =20
+			<map:match
+				pattern=3D"do/getRepositoryData/daisy/**/collection/*/doc/**.source.xm=
l">
+				<map:generate type=3D"html" src=3D"http://{1}/{2}/{3}?navigationType=
=3Dnone" />
 				<map:serialize type=3D"xml" />
 			</map:match>
      =20
 			<map:match
 				pattern=3D"do/getRepositoryData/daisy/**/collection/*/doc/**.xml">
 				<map:generate type=3D"html" src=3D"http://{1}/{2}/{3}?navigationType=
=3Dnone" />
+				<map:transform src=3D"{project:resources.stylesheets}/daisy/preFilter.=
xsl"/>
         <map:transform src=3D"{forrest:stylesheets}/html2document.xsl" />
-				<map:transform src=3D"{project:resources.stylesheets}/daisyFilter.xsl"=
/>
+        <map:transform src=3D"{project:resources.stylesheets}/daisy/postFi=
lter.xsl"/>
 				<map:serialize type=3D"xml" />
 			</map:match>
 		</map:pipeline>
@@ -59,7 +73,9 @@
           <map:parameter name=3D"parameter-name" value=3D"repositoryType"/>
           <map:when test=3D"daisy-wiki">
             <map:generate type=3D"request"/>
-            <map:transform src=3D"resources/stylesheets/repoRequest2doc.xs=
l"/>
+            <map:transform src=3D"resources/stylesheets/repoRequest2doc.xs=
l">
+              <map:parameter name=3D"localURL" value=3D"{1}.xml"/>
+            </map:transform>
             <map:serialize type=3D"xml" />
           </map:when>
         </map:select>
@@ -72,7 +88,9 @@
           <map:parameter name=3D"parameter-name" value=3D"repositoryType"/>
           <map:when test=3D"daisy-wiki">
             <map:generate type=3D"request"/>
-            <map:transform src=3D"resources/stylesheets/repoRequest2doc.xs=
l"/>
+            <map:transform src=3D"resources/stylesheets/repoRequest2doc.xs=
l">
+              <map:parameter name=3D"localURL" value=3D"{1}/{2}.xml"/>
+            </map:transform>
             <map:serialize type=3D"xml" />
           </map:when>
         </map:select>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.=
Daisy/resources/stylesheets/repoRequest2doc.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apa=
che.forrest.plugin.input.Daisy/resources/stylesheets/repoRequest2doc.xsl?re=
v=3D178772&r1=3D178771&r2=3D178772&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/=
resources/stylesheets/repoRequest2doc.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/=
resources/stylesheets/repoRequest2doc.xsl Fri May 27 05:13:13 2005
@@ -19,23 +19,39 @@
 				xmlns:req=3D"http://apache.org/cocoon/request/2.0"
 				version=3D"1.0">
=20
+  <xsl:param name=3D"localURL"/>
   <xsl:param name=3D"documentID"><xsl:value-of select=3D"req:request/req:r=
equestParameters/req:parameter[@name=3D'documentID']/req:value"/></xsl:para=
m>
   <xsl:param name=3D"repositoryURL"><xsl:value-of select=3D"req:request/re=
q:requestParameters/req:parameter[@name=3D'repositoryURL']/req:value"/></xs=
l:param>
 	<xsl:param name=3D"repositoryPort"><xsl:value-of select=3D"req:request/re=
q:requestParameters/req:parameter[@name=3D'repositoryPort']/req:value"/></x=
sl:param>
 	<xsl:param name=3D"repositoryCollection"><xsl:value-of select=3D"req:requ=
est/req:requestParameters/req:parameter[@name=3D'repositoryCollection']/req=
:value"/></xsl:param>
 =09
-  <xsl:template match=3D"req:request">     =20
+  <xsl:template match=3D"req:request">  =20
 			<xsl:choose>
 				<xsl:when test=3D"$repositoryPort">
-					<xsl:variable name=3D"document">cocoon:/do/getRepositoryData/daisy/<x=
sl:value-of select=3D"$repositoryURL"/>/port/<xsl:value-of select=3D"$repos=
itoryPort"/>/collection/<xsl:value-of select=3D"$repositoryCollection"/>/do=
c/<xsl:value-of select=3D"$documentID"/>.xml</xsl:variable>
-		      <xsl:apply-templates select=3D"document($document)"/>
+          <xsl:call-template name=3D"processDocument">
+					  <xsl:with-param name=3D"remoteURL">cocoon:/do/getRepositoryData/dai=
sy/<xsl:value-of select=3D"$repositoryURL"/>/port/<xsl:value-of select=3D"$=
repositoryPort"/>/collection/<xsl:value-of select=3D"$repositoryCollection"=
/>/doc/<xsl:value-of select=3D"$documentID"/></xsl:with-param>
+          </xsl:call-template>
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:variable name=3D"document">cocoon:/do/getRepositoryData/daisy/<x=
sl:value-of select=3D"$repositoryURL"/>/collection/<xsl:value-of select=3D"=
$repositoryCollection"/>/doc/<xsl:value-of select=3D"$documentID"/>.xml</xs=
l:variable>
-		      <xsl:apply-templates select=3D"document($document)"/>
+          <xsl:call-template name=3D"processDocument">
+					  <xsl:with-param name=3D"remoteURL">cocoon:/do/getRepositoryData/dai=
sy/<xsl:value-of select=3D"$repositoryURL"/>/collection/<xsl:value-of selec=
t=3D"$repositoryCollection"/>/doc/<xsl:value-of select=3D"$documentID"/></x=
sl:with-param>
+          </xsl:call-template>
 				</xsl:otherwise>
 		</xsl:choose>
-
+  </xsl:template>
+ =20
+  <xsl:template name=3D"processDocument">
+    <xsl:param name=3D"remoteURL"/>
+    <xsl:choose>
+      <xsl:when test=3D"contains($localURL, '.source.xml')">
+        <xsl:variable name=3D"document"><xsl:value-of select=3D"$remoteURL=
"/>.source.xml</xsl:variable>
+        <xsl:apply-templates select=3D"document($document)"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:variable name=3D"document"><xsl:value-of select=3D"$remoteURL=
"/>.xml</xsl:variable>
+        <xsl:apply-templates select=3D"document($document)"/>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template> =20
    =20
   <xsl:template match=3D"link">

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.apa=
che.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml?re=
v=3D178772&r1=3D178771&r2=3D178772&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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 Fri May 27 05:13:13 2005
@@ -89,31 +89,53 @@
       </table>
      =20
       <section>
+        <title>Retrieving RAW content</title>
+        <p>If you want to retrieve the raw, unprocessed HTML from
+        Daisy simply request the file with a <code>.source.xml</code>
+        extenstion.</p>
+       =20
+        <warning>This behaviour will change in the future to enable
+        you to retrieve the raw unprocessed XML rather than the
+        HTML from Daisy. Use with care in the meantime.</warning>
+      </section>
+     =20
+      <section>
         <title>Filtering Content</title>
         <p>You may not have full control of the content in the repository,=
 or
         you may wish to supress the presentation of some of the parts, for=20
-        example, the fields within the repository. To achieve this you can=20
-        provide an XSL file called <code>daisyFilter.xsl</code> in your=20
-        projects stylesheets directory (default location is=20
-        <code>PROJECT_HOME/src/documentation/resources/stylesheets</code>).
-        Using this file you can filter out any part of the content you=20
-        desire.</p>
-       =20
-        <p>The XSL file operates on the XDoc generated by Forrest, not=20
-        on the source format of the document. If you wish to look at the=20
-        XDoc format of the document simply request the page with an
-        <code>xml</code> extension.</p>
+        example, the fields within the repository. There are two points at=20
+        which you can filter the content, at the point of retrieval (calle=
d a
+        pre-filter) and once the file has been converted to the internal=20
+        Forrest format (called a post-filter).</p>
        =20
         <section>
-          <title>Example</title>
-          <p>To filter out the <code>Fields</code> section of the Daisy
-          document, use the following XSL:</p>
+          <title>Pre-Filters</title>
+         =20
+          <p>Pre-Filters are applied to the HTML retrieved from the=20
+          Daisy repository. To achieve this you can=20
+          provide an XSL file called <code>daisy/preFilter.xsl</code> in y=
our=20
+          projects stylesheet directory (default location is=20
+          <code>PROJECT_HOME/src/documentation/resources/stylesheets</code=
>).</p>
+       =20
+          <p>The preFilter XSL file operates on the HTML generated by Dais=
y=2E=20
+          If you wish to look at this format of the document simply reques=
t=20
+          the page with an <code>.source.xml</code> extension.</p>
+       =20
+          <warning>This behaviour will change in the future,
+          instead of processing the HTML produced by Daisy we will process=20
+          the the XML. Use with care in the meantime.</warning>
          =20
-          <source><![CDATA[
-<xsl:stylesheet xmlns:xsl=3D"http://www.w3.org/1999/XSL/Transform"=20
+          <xsl:stylesheet xmlns:xsl=3D"http://www.w3.org/1999/XSL/Transfor=
m"=20
 				version=3D"1.0">
  =20
-  <xsl:template match=3D"section[title=3D'Fields']"/>
+         =20
+          <section>
+            <title>Example</title>
+            <p>To filter out the document heading of the Daisy
+            document, use the following XSL:</p>
+           =20
+            <source><![CDATA[
+  <xsl:template match=3D"h1[@class=3D'daisy-document-name']"/>
  =20
   <xsl:template match=3D"@*|*|text()|processing-instruction()|comment()">
     <xsl:copy>
@@ -121,13 +143,47 @@
     </xsl:copy>
   </xsl:template>
 </xsl:stylesheet>
-          ]]></source>
-         =20
-          <p>This XSL will filter out all fields from all files retreived=20
-          from a Daisy repository. If you only wanted to remove them from
-          specific files, or only remove specific fields you would need
-          to extend this stylesheet accordingly.</p>
+            ]]></source>
+          </section>
         </section>
+       =20
+        <section>
+          <title>Post-Filters</title>
+         =20
+          <p>Post-Filters are applied to the XDoc generated by=20
+          Forrest. To achieve this you can=20
+          provide an XSL file called <code>daisy/postFilter.xsl</code> in =
your=20
+          projects stylesheet directory (default location is=20
+          <code>PROJECT_HOME/src/documentation/resources/stylesheets</code=
>).</p>
+       =20
+          <p>The postFilter XSL file operates on the XDoc generated by For=
rest.=20
+          If you wish to look at this format of the document simply reques=
t=20
+          the page with an <code>.xml</code> extension.</p>
+       =20
+          <section>
+            <title>Example</title>
+            <p>To filter out the <code>Fields</code> section of the Daisy
+            document, use the following XSL:</p>
+           =20
+            <source><![CDATA[
+  <xsl:stylesheet xmlns:xsl=3D"http://www.w3.org/1999/XSL/Transform"=20
+          version=3D"1.0">
+   =20
+    <xsl:template match=3D"section[title=3D'Fields']"/>
+   =20
+    <xsl:template match=3D"@*|*|text()|processing-instruction()|comment()">
+      <xsl:copy>
+        <xsl:apply-templates select=3D"@*|*|text()|processing-instruction(=
)|comment()"/>
+      </xsl:copy>
+    </xsl:template>
+  </xsl:stylesheet>
+            ]]></source>
+           =20
+            <p>This XSL will filter out all fields from all files retreive=
d=20
+            from a Daisy repository. If you only wanted to remove them from
+            specific files, or only remove specific fields you would need
+            to extend this stylesheet accordingly.</p>
+          </section>
       </section>
      =20
       <section>