Index: openacs-4/packages/news-aggregator/tcl/aggregator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/aggregator-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/news-aggregator/tcl/aggregator-procs.tcl	18 Jul 2018 10:31:09 -0000	1.10
+++ openacs-4/packages/news-aggregator/tcl/aggregator-procs.tcl	18 Jul 2018 16:13:06 -0000	1.11
@@ -375,9 +375,14 @@
     -aggregator_id:required
     -package_id:required
 } {
-
-    db_foreach select_feeds {} {
-
+    Subscribe aggregator to every pre-subscribed feed for the
+    specified package.
+} {
+    foreach source_id [db_list select_feeds {
+       select source_id
+         from na_presubscribed_feeds
+        where package_id = :package_id
+    }] {
         news_aggregator::subscription::new \
             -aggregator_id $aggregator_id \
             -source_id $source_id
Index: openacs-4/packages/news-aggregator/tcl/aggregator-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/Attic/aggregator-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/news-aggregator/tcl/aggregator-procs.xql	20 Mar 2004 11:04:39 -0000	1.1
+++ openacs-4/packages/news-aggregator/tcl/aggregator-procs.xql	18 Jul 2018 16:13:06 -0000	1.2
@@ -1,31 +1,14 @@
 <?xml version="1.0"?>
-
 <queryset>
 
-<fullquery name="news_aggregator::aggregator::load_preinstalled_subscriptions.select_feeds">
-      <querytext>
-        select source_id 
-        from   na_presubscribed_feeds 
-        where  package_id = :package_id
-        </querytext>
-    </fullquery>
-
-<fullquery name="news_aggregator::aggregator::load_preinstalled_subscriptions.select_source_id">
-      <querytext>
-        select source_id
-        from   na_presubscribed_feeds
-        where  package_id = :package_id
-        </querytext>
-    </fullquery>
-
-<fullquery name="news_aggregator::aggregator::options.select_aggregator_options">
-      <querytext>
+  <fullquery name="news_aggregator::aggregator::options.select_aggregator_options">
+    <querytext>
         select a.aggregator_name,
                a.aggregator_id
         from   na_aggregators a join
                acs_objects o on (a.aggregator_id = o.object_id)
         where  o.creation_user = :user_id
-        </querytext>
-    </fullquery>
+    </querytext>
+  </fullquery>
 
 </queryset>
Index: openacs-4/packages/news-aggregator/tcl/subscription-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/subscription-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/news-aggregator/tcl/subscription-procs.tcl	18 Jul 2018 14:08:49 -0000	1.3
+++ openacs-4/packages/news-aggregator/tcl/subscription-procs.tcl	18 Jul 2018 16:13:06 -0000	1.4
@@ -13,6 +13,9 @@
     {-aggregator_id:required}
     {-source_id:required}
 } {
+    Creates a new subscription to a source in an aggregator. If one
+    already exists this proc would just skipt the new creation.
+} {
     if {![db_string subscription_exists_p {
         select exists (select 1 from na_subscriptions
                        where aggregator_id = :aggregator_id
@@ -36,6 +39,8 @@
     {-source_id:required}
     {-aggregator_id:required}
 } {
+    Delete a subscription to a source in an aggregator.
+} {
     db_dml delete_subscription {
         delete from na_subscriptions
         where source_id = :source_id