[Aplaws-commit] r519 - in releases/1.0.2/ccm-ldn-rss: . src/com/arsdigita/london/rss

[<ssk...@re...>]

Author: sskracic
Date: 2005-05-14 00:28:47 +0200 (Sat, 14 May 2005)
New Revision: 519

Modified:
   releases/1.0.2/ccm-ldn-rss/application.xml
   releases/1.0.2/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSService.java
Log:
  Integrated r518 from trunk onto 1.0.2 release branch.


Modified: releases/1.0.2/ccm-ldn-rss/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-rss/application.xml	2005-05-13 21:55:59 UTC (rev 518)
+++ releases/1.0.2/ccm-ldn-rss/application.xml	2005-05-13 22:28:47 UTC (rev 519)
@@ -3,7 +3,7 @@
   name="ccm-ldn-rss"
   prettyName="RSS"
   version="1.4.1"
-  release="10">
+  release="11">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.1.1"/>
     <ccm:requires name="ccm-cms" version="6.1.1"/>

Modified: releases/1.0.2/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSService.java
===================================================================
--- releases/1.0.2/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSService.java	2005-05-13 21:55:59 UTC (rev 518)
+++ releases/1.0.2/ccm-ldn-rss/src/com/arsdigita/london/rss/RSSService.java	2005-05-13 22:28:47 UTC (rev 519)
@@ -46,6 +46,7 @@
 import com.arsdigita.persistence.metadata.MetadataRoot;
 import com.arsdigita.persistence.metadata.ObjectType;
 import com.arsdigita.cms.Article;
+import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.cms.ContentSection;
 import com.arsdigita.cms.ContentPage;
 import com.arsdigita.cms.ContentItem;
@@ -199,21 +200,21 @@
             ContentItem item = itemWrapper.getContentItem();
 
             String title;
+            String description = "";
             try {
-                TextPage page = (TextPage) item;
-                title = page.getTitle();
+                // In Aplaws+, only content bundles get categorised
+                ContentItem primary = ((ContentBundle) item).getPrimaryInstance();
+                try {
+                    ContentPage page = (ContentPage) primary;
+                    title = page.getTitle();
+                    description = page.getSearchSummary();
+                } catch (ClassCastException e) {
+                    title = primary.getDisplayName();
+                }
             } catch (ClassCastException e) {
                 title = item.getDisplayName();
-                // Only TextPage and subclasses can have a description
             }
 
-            String description;
-            try {
-                description = ((Searchable) item).getSearchSummary();
-            } catch (ClassCastException ex) {
-                description = "";
-            }
-
             String itemURL = URLService.locate(item.getOID());
 
             s_log.debug("item is live");