Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory
james.mmbase.org:/tmp/cvs-serv31651/src/java/com/finalist/newsletter/util
Modified Files:
NewsletterUtil.java
Log Message:
CMSC-990 property file modify,newsetter Delete, remove relations before delete
the newsletter Node
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-990
Index: NewsletterUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterUtil.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- NewsletterUtil.java 27 Jul 2008 07:38:09 -0000 1.39
+++ NewsletterUtil.java 1 Aug 2008 02:16:58 -0000 1.40
@@ -66,7 +66,7 @@
Cloud cloud = CloudProviderFactory.getCloudProvider().getAdminCloud();
Node newsletterNode = cloud.getNode(number);
- deleteNewsletterTermsForNewsletter(newsletterNode);
+ deleteSubscriptionByNewsletter(newsletterNode);
deleteNewsletterLogForNewsletter(number);
}
@@ -88,23 +88,11 @@
}
}
}
- public static void deleteNewsletterTermsForNewsletter(Node newsletterNode) {
- NodeManager newsletterTermNodeManager =
newsletterNode.getCloud().getNodeManager("term");
- NodeList terms =
newsletterNode.getRelatedNodes(newsletterTermNodeManager);
- if (terms != null) {
- for (int i = 0; i < terms.size(); i++) {
- Node termNode = terms.getNode(i);
- deleteSubscriptionByTerm(termNode);
- termNode.deleteRelations();
- termNode.delete();
- }
- }
- }
- public static void deleteSubscriptionByTerm(Node termNode) {
+ public static void deleteSubscriptionByNewsletter(Node newsletterNode) {
- NodeManager subscriptionNodeManager =
termNode.getCloud().getNodeManager("subscriptionrecord");
- NodeList subscriptions =
termNode.getRelatedNodes(subscriptionNodeManager);
+ NodeManager subscriptionNodeManager =
newsletterNode.getCloud().getNodeManager("subscriptionrecord");
+ NodeList subscriptions =
newsletterNode.getRelatedNodes(subscriptionNodeManager);
if (subscriptions != null) {
for (int i = 0; i < subscriptions.size(); i++) {
Node subscriptionNode = subscriptions.getNode(i);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
