Index: openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.tcl	5 Oct 2021 12:00:47 -0000	1.10
+++ openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.tcl	12 Apr 2023 13:54:29 -0000	1.11
@@ -34,25 +34,15 @@
     content
     url
 } items select_items [subst {
-    select s.source_id,
-           s.link,
-           s.description,
-           s.title,
-           to_char(last_scanned, 'YYYY-MM-DD HH24:MI:SS') as last_scanned,
-           to_char(creation_date, 'YYYY-MM-DD HH24') as sort_date,
-           (select site_nodes.node_id
-           from site_nodes
-           where site_nodes.object_id = package_id) as node_id,
-           feed_url,
-           item_id,
-           i.title as item_title,
-           i.link as item_link,
-           i.description as item_description
-    from   na_sources s left outer join
-           na_items i on (s.source_id = i.source_id)
-    where  deleted_p = '0'
-    and    package_id in ([join $list_of_package_ids ", "])
-    order  by creation_date desc
+    select to_char(na_items.creation_date, 'YYYY-MM-DD') AS item_sort_date,
+           to_char(na_items.creation_date, 'DD.MM.YYYY') AS item_display_date,
+           na_items.title as item_title,
+           na_items.link as item_link
+    from   na_aggregators
+           inner join na_subscriptions on (na_aggregators.aggregator_id=na_subscriptions.aggregator_id)
+           inner join na_items on (na_subscriptions.source_id = na_items.source_id)
+    where  na_aggregators.package_id in ([join $list_of_package_ids ", "])
+    order  by na_items.creation_date desc
     fetch first 10 rows only
 }] {
     set url [site_node::get_url -node_id $node_id]