Update of 
/var/cvs/contributions/CMSContainer_Modules/egemmail/src/java/com/finalist/cmsc/egemmail/forms
In directory 
james.mmbase.org:/tmp/cvs-serv26527/egemmail/src/java/com/finalist/cmsc/egemmail/forms

Modified Files:
      Tag: b1_4
        EgemExportAction.java 
Log Message:
CMSC-779 Added remote url methods


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/egemmail/src/java/com/finalist/cmsc/egemmail/forms
See also: http://www.mmbase.org/jira/browse/CMSC-779


Index: EgemExportAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/egemmail/src/java/com/finalist/cmsc/egemmail/forms/EgemExportAction.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -b -r1.9.2.1 -r1.9.2.2
--- EgemExportAction.java       25 Feb 2008 12:39:12 -0000      1.9.2.1
+++ EgemExportAction.java       25 Feb 2008 13:24:06 -0000      1.9.2.2
@@ -76,7 +76,7 @@
             Map<String, Object> postParams = new HashMap<String, Object>();
 
             Node node = cloud.getNode(entry.getKey());
-            String liveUrl = getContentUrl(node);
+            String liveUrl = Publish.getRemoteContentUrl(node);
             if (liveUrl != null) {
                postParams.put("url", liveUrl);
 
@@ -155,19 +155,6 @@
       }
    }
 
-
-   private String getContentUrl(Node node) {
-      if (Publish.isPublished(node) && Search.hasContentPages(node)) {
-         int remoteNumber = Publish.getRemoteNumber(node);
-         String livePath = PropertiesUtil.getProperty(EGEMMAIL_LIVEPATH);
-         String appPath = "/content/" + remoteNumber;
-
-         return livePath + appPath;
-      }
-      return null;
-   }
-
-
    @SuppressWarnings("unchecked")
    protected void mergeState(EgemExportForm form, HttpServletRequest request) {
       Set<Integer> newlySelectedNodes = new HashSet<Integer>();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to