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 -N -r1.2 -r1.2.8.1
--- openacs-4/packages/news-aggregator-portlet/www/news-aggregator-admin-portlet.adp	28 Aug 2003 09:41:58 -0000	1.2
+++ openacs-4/packages/news-aggregator-portlet/www/news-aggregator-admin-portlet.adp	27 Jul 2006 11:40:01 -0000	1.2.8.1
@@ -1,3 +1,3 @@
 <ul>
-  <li><a href="@url@subscriptions">Manage subscriptions</a>
+  <li><a href="@url@">Manage subscriptions</a>
 </ul>
Index: openacs-4/packages/news-aggregator-portlet/www/news-aggregator-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator-portlet/www/news-aggregator-admin-portlet.tcl,v
diff -u -N -r1.2 -r1.2.8.1
--- openacs-4/packages/news-aggregator-portlet/www/news-aggregator-admin-portlet.tcl	28 Aug 2003 09:41:58 -0000	1.2
+++ openacs-4/packages/news-aggregator-portlet/www/news-aggregator-admin-portlet.tcl	27 Jul 2006 11:40:01 -0000	1.2.8.1
@@ -17,7 +17,14 @@
 }        
 
 set package_id [lindex $list_of_package_ids 0]        
-set url [lindex [site_node::get_url_from_object_id -object_id $package_id] 0]
+set aggregator_id [db_string get_aggregator_id "select aggregator_id from na_aggregators where package_id = :package_id" -default ""]
 
+if {$aggregator_id eq ""} {
+    # We have a problem!
+    return -code error "There should be an aggregator"
+}
 
+set url [export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $package_id] 0]subscriptions" -url {aggregator_id}]
+
+
 ad_return_template 
Index: openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator-portlet/www/Attic/news-aggregator-portlet-postgresql.xql,v
diff -u -N -r1.2.8.1 -r1.2.8.2
--- openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet-postgresql.xql	23 Jan 2006 15:46:15 -0000	1.2.8.1
+++ openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet-postgresql.xql	27 Jul 2006 11:40:01 -0000	1.2.8.2
@@ -19,12 +19,12 @@
                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),
-	       acs_objects o
-        where  deleted_p = '0'
-	and    s.source_id = o.object_id
-	and    package_id in ([join $list_of_package_ids ", "])
+        from   na_items i,   na_sources s join (
+                           na_subscriptions su  join
+                           na_aggregators a on (a.aggregator_id = su.aggregator_id))
+                           on  (s.source_id = su.source_id)
+        where  a.package_id in ([join $list_of_package_ids ", "])
+	and    s.source_id = i.source_id
         order  by i.creation_date desc
         limit  10
 </querytext>
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 -N -r1.3 -r1.3.2.1
--- openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp	20 Apr 2004 21:13:51 -0000	1.3
+++ openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.adp	27 Jul 2006 11:40:01 -0000	1.3.2.1
@@ -36,7 +36,7 @@
 
   <if @write_p@ eq 1>
     <p>
-      <b>&raquo;</b> <a href="@items.url@subscriptions">Add or remove subscriptions</a>
+      <b>&raquo;</b> <a href="@subscription_url@">Add or remove subscriptions</a>
     </p>
   </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 -N -r1.3 -r1.3.8.1
--- openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.tcl	7 Nov 2003 17:35:42 -0000	1.3
+++ openacs-4/packages/news-aggregator-portlet/www/news-aggregator-portlet.tcl	27 Jul 2006 11:40:01 -0000	1.3.8.1
@@ -16,6 +16,16 @@
 set list_of_package_ids $config(package_id)
 set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0]
 
+set package_id [lindex $list_of_package_ids 0]        
+set aggregator_id [db_string get_aggregator_id "select aggregator_id from na_aggregators where package_id = :package_id limit 1" -default ""]
+
+if {$aggregator_id eq ""} {
+    # We have a problem!
+    return -code error "There should be an aggregator"
+}
+
+set subscription_url [export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $package_id] 0]subscriptions" -url {aggregator_id}]
+
 db_multirow -extend content items select_items {} {
     set text_only [string_truncate -len 300 -- $item_description]
     if {[exists_and_not_null item_title] && ![string equal -nocase $item_title $text_only] } {