From 023048dd16ffa6a1f2629020c78671362dc94954 Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 14 May 2013 15:19:37 +0000 Subject: [PATCH] =?UTF-8?q?Weitere=20Erg=C3=A4nzungen=20f=C3=BCr=20den=20X?= =?UTF-8?q?MLDeliveryCache,=20insbesondere=20invalidierung.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@2154 8810af33-2d31-482b-a856-94f89814c4df --- .../com/arsdigita/cms/contenttypes/ExpertiseBundle.java | 5 +++++ .../arsdigita/cms/contenttypes/InternetArticleBundle.java | 3 +++ .../com/arsdigita/cms/contenttypes/ProceedingsBundle.java | 3 +++ .../com/arsdigita/cms/contenttypes/PublicationBundle.java | 7 ++++++- .../src/com/arsdigita/cms/contenttypes/SeriesBundle.java | 3 +++ .../com/arsdigita/cms/contenttypes/UnPublishedBundle.java | 3 +++ 6 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ExpertiseBundle.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ExpertiseBundle.java index d78e1c0c6..d27c6eacf 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ExpertiseBundle.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ExpertiseBundle.java @@ -3,6 +3,7 @@ package com.arsdigita.cms.contenttypes; import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.CustomCopy; import com.arsdigita.cms.ItemCopier; +import com.arsdigita.cms.XMLDeliveryCache; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataCollection; @@ -182,6 +183,8 @@ public class ExpertiseBundle extends PublicationBundle { link.set("orgaOrder", expertises.get("link.orderOrder")); link.save(); + + XMLDeliveryCache.getInstance().removeFromCache(liveExpertise.getOID()); } } @@ -200,6 +203,8 @@ public class ExpertiseBundle extends PublicationBundle { link.set("ordererOrder", expertises.get("link.ordererOrder")); link.save(); + + XMLDeliveryCache.getInstance().removeFromCache(liveExpertise.getOID()); } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InternetArticleBundle.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InternetArticleBundle.java index d69603fc2..8612af543 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InternetArticleBundle.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InternetArticleBundle.java @@ -3,6 +3,7 @@ package com.arsdigita.cms.contenttypes; import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.CustomCopy; import com.arsdigita.cms.ItemCopier; +import com.arsdigita.cms.XMLDeliveryCache; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataCollection; @@ -145,6 +146,8 @@ public class InternetArticleBundle extends PublicationBundle { link.set("orgaOrder", 1); link.save(); + + XMLDeliveryCache.getInstance().removeFromCache(liveInternetArticle.getOID()); } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ProceedingsBundle.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ProceedingsBundle.java index 204eb8b7c..6167ff929 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ProceedingsBundle.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ProceedingsBundle.java @@ -3,6 +3,7 @@ package com.arsdigita.cms.contenttypes; import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.CustomCopy; import com.arsdigita.cms.ItemCopier; +import com.arsdigita.cms.XMLDeliveryCache; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataCollection; @@ -169,6 +170,8 @@ public class ProceedingsBundle extends PublicationWithPublisherBundle { link.set("organizerOrder", 1); link.save(); + + XMLDeliveryCache.getInstance().removeFromCache(liveProceedings.getOID()); } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationBundle.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationBundle.java index 2829be782..fc875a3c1 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationBundle.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationBundle.java @@ -5,6 +5,7 @@ import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.CustomCopy; import com.arsdigita.cms.ItemCollection; import com.arsdigita.cms.ItemCopier; +import com.arsdigita.cms.XMLDeliveryCache; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataCollection; @@ -190,9 +191,11 @@ public class PublicationBundle extends ContentBundle { link.set(EDITOR, publications.get(AuthorshipCollection.LINKEDITOR)); link.set(AUTHOR_ORDER, publications.get( - AuthorshipCollection.LINKORDER)); + AuthorshipCollection.LINKORDER)); link.save(); + + XMLDeliveryCache.getInstance().removeFromCache(livePublication.getOID()); } } @@ -213,6 +216,8 @@ public class PublicationBundle extends ContentBundle { link.set(ORGAUNIT_ORDER, publications.get("link." + ORGAUNIT_ORDER)); link.save(); + + XMLDeliveryCache.getInstance().removeFromCache(livePublication.getOID()); } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesBundle.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesBundle.java index d7001f1cb..19f5d9102 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesBundle.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesBundle.java @@ -4,6 +4,7 @@ import com.arsdigita.cms.ContentBundle; import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.CustomCopy; import com.arsdigita.cms.ItemCopier; +import com.arsdigita.cms.XMLDeliveryCache; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataCollection; @@ -199,6 +200,8 @@ public class SeriesBundle extends ContentBundle { link.set(EDITOR_ORDER, series.get("link." + EDITOR_ORDER)); link.save(); + + XMLDeliveryCache.getInstance().removeFromCache(liveSeries.getOID()); } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/UnPublishedBundle.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/UnPublishedBundle.java index 73bb738cc..082751aa2 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/UnPublishedBundle.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/UnPublishedBundle.java @@ -3,6 +3,7 @@ package com.arsdigita.cms.contenttypes; import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.CustomCopy; import com.arsdigita.cms.ItemCopier; +import com.arsdigita.cms.XMLDeliveryCache; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataCollection; @@ -145,6 +146,8 @@ public class UnPublishedBundle extends PublicationBundle { link.set("orgaOrder", 1); link.save(); + + XMLDeliveryCache.getInstance().removeFromCache(liveUnPublished.getOID()); } }