Prevent the double display of the home page

Jahia · Dec 14, 2020 · 61e9c90 · 61e9c90
1 parent c568976
commit 61e9c90
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/main/resources/jmix_sitemap/txt/sitemap.sitemap.jsp b/src/main/resources/jmix_sitemap/txt/sitemap.sitemap.jsp
@@ -11,6 +11,7 @@
     </c:when>
     <c:otherwise>
         <c:set var="siteMapNode" value="${currentNode}"/>
+        <c:url value="${url.base}${currentNode.path}.html"/>
     </c:otherwise>
 </c:choose>    
 
@@ -19,8 +20,6 @@
     <query:descendantNode path="${siteMapNode.path}" selectorName="stmp"/>
 </jcr:jqom>
 
-<c:url value="${url.base}${currentNode.path}.html"/>
 <c:forEach items="${sitemaps.nodes}" varStatus="status" var="sitemapEL">
     <c:url value="${url.base}${sitemapEL.path}.html"/>
-
 </c:forEach>    
diff --git a/src/main/resources/jmix_sitemap/xml/sitemap.sitemap.jsp b/src/main/resources/jmix_sitemap/xml/sitemap.sitemap.jsp
@@ -9,19 +9,28 @@
         xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"
         xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 
+    <jcr:nodeProperty node="${currentNode}" name="jcr:lastModified" var="lastModif"/>
+
     <c:choose>
         <c:when test="${(currentNode.name == 'home')}">
             <c:set var="siteMapNode" value="${currentNode.parent}"/>
         </c:when>
         <c:otherwise>
             <c:set var="siteMapNode" value="${currentNode}"/>
+            <url>
+                <loc>${serverUrl}<c:url value="${url.base}${currentNode.path}.html"/></loc>
+                <lastmod><fmt:formatDate value="${lastModif.date.time}" pattern="yyyy-MM-dd"/></lastmod>
+                <changefreq>${currentNode.properties.changefreq.string}</changefreq>
+                <priority>${currentNode.properties.priority.string}</priority>
+            </url>
         </c:otherwise>
     </c:choose>    
 
     <jcr:jqom var="sitemaps">
         <query:selector nodeTypeName="jmix:sitemap" selectorName="stmp"/>
         <query:descendantNode path="${siteMapNode.path}" selectorName="stmp"/>
     </jcr:jqom>
+
     <c:choose>
         <c:when test="${((pageContext.request.scheme == 'http') && (pageContext.request.serverPort == 80)) || (pageContext.request.scheme == 'https') && (pageContext.request.serverPort == 443)}">
             <c:set var="serverUrl" value="${pageContext.request.scheme}://${pageContext.request.serverName}"/>
@@ -31,14 +40,6 @@
         </c:otherwise>
     </c:choose>    
 
-    <jcr:nodeProperty node="${currentNode}" name="jcr:lastModified" var="lastModif"/>
-    <url>
-        <loc>${serverUrl}<c:url value="${url.base}${currentNode.path}.html"/></loc>
-        <lastmod><fmt:formatDate value="${lastModif.date.time}" pattern="yyyy-MM-dd"/></lastmod>
-        <changefreq>${currentNode.properties.changefreq.string}</changefreq>
-        <priority>${currentNode.properties.priority.string}</priority>
-    </url>
-
     <c:forEach items="${sitemaps.nodes}" varStatus="status" var="sitemapEL">
         <jcr:nodeProperty node="${sitemapEL}" name="jcr:lastModified" var="lastModif"/>
         <url>