Return-Path: 
 <svn-return-3063-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 52663 invoked from network); 4 Jul 2005 12:58:46 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 4 Jul 2005 12:58:46 -0000
Received: (qmail 1927 invoked by uid 500); 4 Jul 2005 12:58:40 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 1674 invoked by uid 500); 4 Jul 2005 12:58:38 -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 1408 invoked by uid 99); 4 Jul 2005 12:58:36 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jul 2005 05:58:36 -0700
X-ASF-Spam-Status: No, hits=0.2 required=10.0
	tests=NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Mon, 04 Jul 2005 05:58:37 -0700
Received: (qmail 52603 invoked by uid 65534); 4 Jul 2005 12:58:33 -0000
Message-ID: <20050704125833.52595.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r209067 -
 /forrest/branches/locationmap_branch/main/webapp/forrest.xmap
Date: Mon, 04 Jul 2005 12:58:33 -0000
To: svn@forrest.apache.org
From: rgardler@apache.org
X-Mailer: svnmailer-1.0.2
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: rgardler
Date: Mon Jul  4 05:58:32 2005
New Revision: 209067

URL: http://svn.apache.org/viewcvs?rev=209067&view=rev
Log:
Add workaround for case when locationmap does not contain match (see FOR-554)

Modified:
    forrest/branches/locationmap_branch/main/webapp/forrest.xmap

Modified: forrest/branches/locationmap_branch/main/webapp/forrest.xmap
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/main/webapp/forrest.xmap?rev=209067&r1=209066&r2=209067&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/main/webapp/forrest.xmap (original)
+++ forrest/branches/locationmap_branch/main/webapp/forrest.xmap Mon Jul  4 05:58:32 2005
@@ -300,8 +300,15 @@
        </map:match>
    
        <map:match pattern="**.xml">
-        <map:generate src="{lm:{0}}" />
-        <map:serialize type="xml"/>
+         <map:select type="exists">
+           <map:when test="{lm:{0}}">
+             <map:generate src="{lm:{0}}"/>
+           </map:when>
+           <map:otherwise>
+             <map:generate src="{project:content.xdocs}{0}"/>
+           </map:otherwise>
+         </map:select>
+         <map:serialize type="xml"/>
        </map:match>
      </map:match>