[Cobricks-cvscommit] cobricks2/src/org/cobricks/portal PortalRequest.java

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5749

Modified Files:
	PortalRequest.java 
Log Message:


Index: PortalRequest.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalRequest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- PortalRequest.java	1 Oct 2004 13:27:12 -0000	1.10
+++ PortalRequest.java	30 Oct 2004 13:47:20 -0000	1.11
@@ -242,18 +242,20 @@
         if (tmps != null) lang = tmps;
         if (request.getParameter("lang")!=null)
             lang = request.getParameter("lang");
-        pos = pageName.lastIndexOf(".");
-        // page.html.XX
-        if (pos > pageName.length()-2) {
-            lang = pageName.substring(pageName.length()-2);
-            pageName = pageName.substring(0, pageName.length()-3);
-        }
-        // page.XX.html
-        else if (pos > 2 && pageName.substring(pos-3, pos-2).equals(".")) {
-            lang = pageName.substring(pos-2, pos);
-            pageName = pageName.substring(0, pos-3) + pageName.substring(pos);
+        if (!pageName.endsWith(".xml")) {
+            pos = pageName.lastIndexOf(".");
+            // page.html.XX
+            if (pos > pageName.length()-2) {
+                lang = pageName.substring(pageName.length()-2);
+                pageName = pageName.substring(0, pageName.length()-3);
+            }
+            // page.XX.html
+            else if (pos > 2 && pageName.substring(pos-3, pos-2).equals(".")) {
+                lang = pageName.substring(pos-2, pos);
+                pageName = pageName.substring(0, pos-3) + pageName.substring(pos);
+            }
+            if (lang.length()>2) lang = lang.substring(0,2);
         }
-        if (lang.length()>2) lang = lang.substring(0,2);
 
         velocityContext.put("pagePath", pagePath);
         velocityContext.put("pageName", pageName);