Changeset 6078

Timestamp:

11/23/11 13:09:13 (6 months ago)

Author:

mtld

Message:

fixed pagealternative handling bugs

Location:

trunk/pustefix-core/src/main

Files:

• java/de/schlund/pfixxml/PfixServletRequestImpl.java (modified) (1 diff)
• java/org/pustefixframework/http/AbstractPustefixRequestHandler.java (modified) (1 diff)
• resources/PUSTEFIX-INF/xsl/functions.xsl (modified) (1 diff)
• resources/pustefix/xsl/depend.xsl (modified) (2 diffs)

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/PfixServletRequestImpl.java

@@ -173 +173 @@
         this.request = req;
         this.session = req.getSession(false);
+        internalPageName = null;
     }
 

trunk/pustefix-core/src/main/java/org/pustefixframework/http/AbstractPustefixRequestHandler.java

@@ -456 +456 @@
                         }
                     }
+                } else {
+                    List<String> pageAltAliases = siteMap.getPageAlternativeAliases(registeredPage, null);
+                    if(pageAltAliases != null) {
+                        for(String pageAltAlias: pageAltAliases) {
+                            uris.add("/" + pageAltAlias);
+                        }
+                    }
                 }
             }

trunk/pustefix-core/src/main/resources/PUSTEFIX-INF/xsl/functions.xsl

@@ -123 +123 @@
     <xsl:param name="pageName"/>
     <xsl:param name="language"><xsl:value-of select="$lang"/></xsl:param>
-    <xsl:param name="altKey"/>
+    <xsl:param name="altKey"><xsl:if test="$page=$pageName and $pageAlternative"><xsl:value-of select="$pageAlternative"/></xsl:if></xsl:param>
     <func:result select="callback:omitPage($__context__,$__target_gen,$pageName,$language,$altKey)"/>
   </func:function>

trunk/pustefix-core/src/main/resources/pustefix/xsl/depend.xsl

@@ -193 +193 @@
     <xsl:variable name="node" select="."/>
     <xsl:if test="$rec='true'">
+     <xsl:choose>
+     <xsl:when test="/make/standardpage-alternative">
       <xsl:for-each select="/make/standardpage-alternative">
         <xsl:apply-templates select="$node">
@@ -229 +231 @@
         </xsl:for-each>
       </xsl:for-each>
+     </xsl:when>
+     <xsl:otherwise>
+       <xsl:for-each select="$node/standardpage-alternative">
+          <xsl:apply-templates select="$node">
+            <xsl:with-param name="variant">
+              <xsl:choose>
+                <xsl:when test="$node/@variant">
+                  <xsl:value-of select="concat($node/@variant, ':', .)"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="."/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:with-param>
+            <xsl:with-param name="rec">false</xsl:with-param>
+            <xsl:with-param name="pageAlternative" select="."/>
+          </xsl:apply-templates>
+        </xsl:for-each>
+     </xsl:otherwise>
+     </xsl:choose>
     </xsl:if>
   </xsl:template>