Return-Path: 
 <svn-return-2103-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 81594 invoked from network); 22 Apr 2005 23:44:44 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 22 Apr 2005 23:44:44 -0000
Received: (qmail 10060 invoked by uid 500); 22 Apr 2005 23:45:12 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 9980 invoked by uid 500); 22 Apr 2005 23:45:12 -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>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 9965 invoked by uid 99); 22 Apr 2005 23:45:12 -0000
X-ASF-Spam-Status: No, hits=0.2 required=10.0
	tests=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, 22 Apr 2005 16:45:12 -0700
Received: (qmail 81547 invoked by uid 65534); 22 Apr 2005 23:44:42 -0000
Message-ID: <20050422234442.81546.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r164301 -
 /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap
Date: Fri, 22 Apr 2005 23:44:41 -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 Apr 22 16:44:40 2005
New Revision: 164301

URL: http://svn.apache.org/viewcvs?rev=3D164301&view=3Drev
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 indep=
endant 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.apa=
che.forrest.plugin.input.Daisy/input.xmap?rev=3D164301&r1=3D164300&r2=3D164=
301&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 Apr 22 16:44:40 2005
@@ -32,21 +32,22 @@
 		<!-- =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/*/doc/**.xml">
-				<map:generate type=3D"html" src=3D"http://{1}:{2}/{3}?navigationType=
=3Dnone" />
+				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"{forrest:stylesheets}/html2document.xsl" />
 				<map:serialize type=3D"xml" />
 			</map:match>
+     =20
 			<map:match
-				pattern=3D"do/getRepositoryData/daisy/*/doc/**.xml">
-				<map:generate type=3D"html" src=3D"http://{1}/{2}?navigationType=3Dnon=
e" />
+				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"{forrest:stylesheets}/html2document.xsl" />
 				<map:serialize type=3D"xml" />
 			</map:match>
 		</map:pipeline>
=20
 		<map:pipeline>
-			<map:match pattern=3D"**.xml">
+			<map:match pattern=3D"*.xml">
         <map:select type=3D"exists">
           <map:when test=3D"{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=3D"request"/>
-            <map:transform src=3D"resources/stylesheets/repoRequest2doc.xs=
l">
-              <map:parameter name=3D"documentID" value=3D"{1}"/>
-            </map:transform>
+            <map:transform src=3D"resources/stylesheets/repoRequest2doc.xs=
l"/>
+            <map:serialize type=3D"xml" />
+          </map:otherwise>
+        </map:select>
+			</map:match>
+		</map:pipeline>
+
+		<map:pipeline>
+			<map:match pattern=3D"**/*.xml">
+        <map:select type=3D"exists">
+          <map:when test=3D"{project:content.xdocs}{0}">
+            <!-- Do nothing as we want to use the local file -->
+            <!-- FIXME: this requires that this plgin goes last in the pro=
cessing chain
+                 this goeas against the recomendations for building Forres=
t Plugins.
+                 Can we select on the request parameters instead? -->
+          </map:when>
+          <map:otherwise>
+            <map:generate type=3D"request"/>
+            <map:transform src=3D"resources/stylesheets/repoRequest2doc.xs=
l"/>
             <map:serialize type=3D"xml" />
           </map:otherwise>
         </map:select>