[Aplaws-commit] r1081 - in trunk/ccm-ldn-atoz/src/com/arsdigita/london/atoz: . terms

[<ap...@vh...>]

Author: apevec
Date: 2006-01-17 17:54:32 +0100 (Tue, 17 Jan 2006)
New Revision: 1081

Modified:
   trunk/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZItemGenerator.java
   trunk/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZSiteProxyGenerator.java
   trunk/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainGenerator.java
Log:
use c.a.web.URL to generate links in all AtoZ generators


Modified: trunk/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZItemGenerator.java
===================================================================
--- trunk/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZItemGenerator.java	2006-01-17 16:05:34 UTC (rev 1080)
+++ trunk/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZItemGenerator.java	2006-01-17 16:54:32 UTC (rev 1081)
@@ -24,6 +24,9 @@
 import com.arsdigita.persistence.DataQuery;
 import com.arsdigita.persistence.Filter;
 import com.arsdigita.persistence.OID;
+import com.arsdigita.web.ParameterMap;
+import com.arsdigita.web.URL;
+import com.arsdigita.web.Web;
 import com.arsdigita.xml.Element;
 
 import java.math.BigDecimal;
@@ -106,7 +109,13 @@
         }
 
         public String getLink() {
-            return "/redirect/?oid=" + m_oid;
+            ParameterMap map = new ParameterMap();
+            map.setParameter("oid", m_oid.toString());
+
+            URL here = Web.getContext().getRequestURL();
+
+            return (new URL(here.getScheme(), here.getServerName(), here
+                    .getServerPort(), "", "", "/redirect/", map)).toString();
         }
 
         public Element getContent() {

Modified: trunk/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZSiteProxyGenerator.java
===================================================================
--- trunk/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZSiteProxyGenerator.java	2006-01-17 16:05:34 UTC (rev 1080)
+++ trunk/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZSiteProxyGenerator.java	2006-01-17 16:54:32 UTC (rev 1081)
@@ -27,6 +27,9 @@
 import com.arsdigita.persistence.DataQuery;
 import com.arsdigita.persistence.OID;
 import com.arsdigita.util.url.URLData;
+import com.arsdigita.web.ParameterMap;
+import com.arsdigita.web.URL;
+import com.arsdigita.web.Web;
 import com.arsdigita.xml.Element;
 
 public class AtoZSiteProxyGenerator extends AbstractAtoZGenerator {
@@ -105,7 +108,13 @@
         }
 
         public String getLink() {
-            return "/redirect?oid=" + m_oid.toString();
+            ParameterMap map = new ParameterMap();
+            map.setParameter("oid", m_oid.toString());
+
+            URL here = Web.getContext().getRequestURL();
+
+            return (new URL(here.getScheme(), here.getServerName(), here
+                    .getServerPort(), "", "", "/redirect/", map)).toString();
         }
 
         public Element getContent() {

Modified: trunk/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainGenerator.java
===================================================================
--- trunk/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainGenerator.java	2006-01-17 16:05:34 UTC (rev 1080)
+++ trunk/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainGenerator.java	2006-01-17 16:54:32 UTC (rev 1081)
@@ -29,6 +29,9 @@
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.Filter;
 import com.arsdigita.persistence.OID;
+import com.arsdigita.web.ParameterMap;
+import com.arsdigita.web.URL;
+import com.arsdigita.web.Web;
 import com.arsdigita.xml.Element;
 
 import java.util.List;
@@ -89,7 +92,13 @@
         }
 
         public String getLink() {
-            return "/redirect/?oid=" + m_oid;
+            ParameterMap map = new ParameterMap();
+            map.setParameter("oid", m_oid.toString());
+
+            URL here = Web.getContext().getRequestURL();
+
+            return (new URL(here.getScheme(), here.getServerName(), here
+                    .getServerPort(), "", "", "/redirect/", map)).toString();
         }
 
         public Element getContent() {