Index: openacs-4/packages/news-aggregator-portlet/news-aggregator-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator-portlet/news-aggregator-portlet.info,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/news-aggregator-portlet/news-aggregator-portlet.info	24 Feb 2005 13:33:24 -0000	1.6
+++ openacs-4/packages/news-aggregator-portlet/news-aggregator-portlet.info	12 Apr 2023 13:54:29 -0000	1.7
@@ -7,13 +7,13 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="0.4" url="http://openacs.org/repository/download/apm/news-aggregator-portlet-0.4.apm">
+    <version name="0.5" url="http://openacs.org/repository/download/apm/news-aggregator-portlet-0.5.apm">
         <owner url="mailto:simon@bcuni.net">Simon Carstensen</owner>
         <release-date>2003-05-15</release-date>
         <summary>A portlet interface to News Aggregator</summary>
 
-        <provides url="news-aggregator-portlet" version="0.4"/>
-        <requires url="news-aggregator" version="0.2d"/>
+        <provides url="news-aggregator-portlet" version="0.5"/>
+        <requires url="news-aggregator" version="0.14d"/>
         <requires url="new-portal" version="0.2d1"/>
 
         <callbacks>
Index: openacs-4/packages/news-aggregator-portlet/www/news-aggregator-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator-portlet/www/news-aggregator-admin-portlet.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/news-aggregator-portlet/www/news-aggregator-admin-portlet.adp	26 Feb 2007 19:49:55 -0000	1.3
+++ openacs-4/packages/news-aggregator-portlet/www/news-aggregator-admin-portlet.adp	12 Apr 2023 13:54:29 -0000	1.4
@@ -1,3 +1,3 @@
 <ul>
-  <li><a href="@url@">#news-aggregator-portlet.Manage_subscriptions#</a>
+  <li><a href="@url@">#news-aggregator.Manage_Subscriptions#</a>
 </ul>
Index: openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp	22 May 2018 17:30:02 -0000	1.7
+++ openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp	12 Apr 2023 13:54:29 -0000	1.8
@@ -2,43 +2,18 @@
 
   <if @items:rowcount@ gt 0>
 
-    <table cellspacing=1 cellpadding=0 border=0>
-	<tr>
-        <td bgcolor="#cccccc">
-          <table cellspacing=1 cellpadding=5 border=0 width="100%">
-            <multiple name="items">
-	      <group column="sort_date">
-                <tr bgcolor="#f5f5f5">
-                    <td><b><a href="@items.link@">@items.title@</a>, @items.last_scanned@</b></td>
-                    <td><a href="@items.feed_url@">RSS</a></td>
-                </tr>
-                <group column="source_id">
-                  <tr bgcolor="#ffffff">
-                      <td>
-                        @items.content;noquote@
-                        <if @items.item_link@ not nil>
-                          <a href="@items.item_link@">#</a>
-                        </if>
-                      </td>
-                      <td>&nbsp;</td>
-                    </tr>
-                  </group>
-                </group>
-	      </multiple>
-            </table>
-          </td>
-        </tr>
-    </table>
+    <multiple name="items">
+      <div><b>@items.item_display_date@</b></div>
+      <ul style="margin-top:0px;margin-bottom:5px;">
+        <group column="item_sort_date">
+          <li><a href="@items.item_link@" target="_blank">@items.item_title@</a></li>
+        </group>
+      </ul>
+    </multiple>
 
-  <if @write_p;literal@ true>
-    <p>
-      <b>&raquo;</b> <a href="@subscription_url@">Add or remove subscriptions</a>
-    </p>
   </if>
-
-  </if>
   <else>
-    <small>#news-aggregator-portlet.No_Items#</small>
+    <small>#news-aggregator.No_items#</small>
   </else>
 
 </if>
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 -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]