[MMBASE SCM] r42470 - in CMSContainer/trunk/CMSContainer/cmsc: search/src/java/com/finalist/cmsc/services/search taglib/src/java/com/finalist/cmsc/taglib

[fpunt]

Author: fpunt
Date: 2010-06-08 17:44:22 +0200 (Tue, 08 Jun 2010)
New Revision: 42470

Modified:
   
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
   
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
Log:
[CMSC-1701]

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
 2010-06-08 15:19:41 UTC (rev 42469)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
 2010-06-08 15:44:22 UTC (rev 42470)
@@ -100,7 +100,7 @@
                 pageInfo = Search.findDetailPageForContent(node, 
request.getServerName());
             }
             else {
-                pageInfo = Search.findDetailPageForContent(node);
+                pageInfo = Search.findDetailPageForContent(node, 
request.getParameter("server"));
             }
 
             if (pageInfo != null) {
@@ -121,7 +121,7 @@
 
         if (redirect != null) {
             if (this.forwardRequest) {
-                if (redirect.indexOf("://") > -1 && 
ServerUtil.useServerName()) {
+                if (redirect.indexOf("://") > -1 && 
(ServerUtil.useServerName()) {
                     // not a valid forward dispatch url, but it might be 
converted to one.
                     String currentHost = request.getServerName();
                     int hostIndex = redirect.indexOf("://" + currentHost);

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
    2010-06-08 15:19:41 UTC (rev 42469)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
    2010-06-08 15:44:22 UTC (rev 42470)
@@ -9,6 +9,8 @@
  */
 package com.finalist.cmsc.taglib;
 
+import java.net.URLEncoder;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.JspTagException;
@@ -19,6 +21,7 @@
 
 import com.finalist.cmsc.mmbase.ResourcesUtil;
 import com.finalist.cmsc.util.HttpUtil;
+import com.finalist.cmsc.util.ServerUtil;
 
 @SuppressWarnings("serial")
 public class ContentUrlTag extends NodeReferrerTag {
@@ -69,6 +72,9 @@
             if (absolute) {
                url = makeAbsolute(url);
             }
+            if(!ServerUtil.useServerName()) {
+               url += 
"?server="+URLEncoder.encode(pageContext.getRequest().getServerName());
+            }
          }
       }
 

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs