forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r202148 - in /forrest/branches/locationmap_branch/main/webapp: linkmap.xmap menu.xmap tabs.xmap
Date Tue, 28 Jun 2005 09:42:05 GMT
Author: rgardler
Date: Tue Jun 28 02:42:04 2005
New Revision: 202148

URL: http://svn.apache.org/viewcvs?rev=202148&view=rev
Log:
Improve error response when locationmap does not have a match (partial fix for FOR-554, due
to Tim WIlliams)

Modified:
    forrest/branches/locationmap_branch/main/webapp/linkmap.xmap
    forrest/branches/locationmap_branch/main/webapp/menu.xmap
    forrest/branches/locationmap_branch/main/webapp/tabs.xmap

Modified: forrest/branches/locationmap_branch/main/webapp/linkmap.xmap
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/main/webapp/linkmap.xmap?rev=202148&r1=202147&r2=202148&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/main/webapp/linkmap.xmap (original)
+++ forrest/branches/locationmap_branch/main/webapp/linkmap.xmap Tue Jun 28 02:42:04 2005
@@ -42,6 +42,7 @@
  
      <map:pipeline>     
       <map:match pattern="linkmap.xml">
+
         <map:generate src="cocoon://abs-linkmap" />
         <map:transform src="{forrest:stylesheets}/linkmap2document.xsl"/>
         <map:serialize type="xml" />
@@ -49,14 +50,14 @@
       
       <!-- site.xml with @href's appended to be context-relative. -->
       <map:match pattern="abs-linkmap">
-			 <map:select type="exists">
-				 <map:when test="{project:content.xdocs}site.xml">
-				  <map:generate src="{project:content.xdocs}site.xml"/>
-			  </map:when>
-				<map:when test="{lm:site.xml}">
-					<map:generate src="{lm:site.xml}"/>
-				</map:when>
-          </map:select>
+			  <map:select type="exists">
+				  <map:when test="{project:content.xdocs}site.xml">
+				    <map:generate src="{project:content.xdocs}site.xml"/>
+			    </map:when>
+				  <map:otherwise>
+				    <map:generate src="{lm:site.xml}"/>
+		      </map:otherwise>
+        </map:select>
         <map:transform type="xinclude"/>
         <map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
         <map:serialize type="xml" />

Modified: forrest/branches/locationmap_branch/main/webapp/menu.xmap
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/main/webapp/menu.xmap?rev=202148&r1=202147&r2=202148&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/main/webapp/menu.xmap (original)
+++ forrest/branches/locationmap_branch/main/webapp/menu.xmap Tue Jun 28 02:42:04 2005
@@ -61,14 +61,14 @@
 
     <map:pipeline internal-only="false">
       <map:match pattern="abs-menulinks">
-			<map:select type="exists">
-				 <map:when test="{project:content.xdocs}site.xml">
-				  <map:generate src="{project:content.xdocs}site.xml"/>
-			  </map:when>
-				<map:when test="{lm:site.xml}">
-					<map:generate src="{lm:site.xml}"/>
-				</map:when>
-          </map:select>
+			  <map:select type="exists">
+				  <map:when test="{project:content.xdocs}site.xml">
+				    <map:generate src="{project:content.xdocs}site.xml"/>
+			    </map:when>
+				  <map:otherwise>
+					  <map:generate src="{lm:site.xml}"/>
+				  </map:otherwise>
+        </map:select>
         <map:transform type="xinclude"/>
         <map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
         <map:transform src="{forrest:stylesheets}/site2site-normalizetabs.xsl" />
@@ -77,14 +77,14 @@
       </map:match>
 
       <map:match pattern="**menulinks-*">
-           <map:select type="exists">
-				 	<map:when test="{project:content.xdocs}site.xml">
-				  		<map:generate src="{project:content.xdocs}site.xml"/>
-			  		</map:when>
-					<map:when test="{lm:site.xml}">
+        <map:select type="exists">
+				  <map:when test="{project:content.xdocs}site.xml">
+				    <map:generate src="{project:content.xdocs}site.xml"/>
+			  	</map:when>
+					<map:otherwise>
 						<map:generate src="{lm:site.xml}"/>
-					</map:when>
-          </map:select>
+					</map:otherwise>
+        </map:select>
         <map:transform type="xinclude"/>
         <map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" />
 

Modified: forrest/branches/locationmap_branch/main/webapp/tabs.xmap
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/main/webapp/tabs.xmap?rev=202148&r1=202147&r2=202148&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/main/webapp/tabs.xmap (original)
+++ forrest/branches/locationmap_branch/main/webapp/tabs.xmap Tue Jun 28 02:42:04 2005
@@ -73,9 +73,9 @@
 				 <map:when test="{project:content.xdocs}tabs.xml">
 				  <map:generate src="{project:content.xdocs}tabs.xml"/>
 			  </map:when>
-				<map:when test="{lm:tabs.xml}">
+				<map:otherwise>
 					<map:generate src="{lm:tabs.xml}"/>
-				</map:when>
+				</map:otherwise>
 		 	</map:select>
         <map:transform type="xinclude"/>
         <map:select type="config">



Mime
View raw message