Index: openacs-4/packages/news-aggregator/tcl/aggregator-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/aggregator-procs-postgresql.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/news-aggregator/tcl/aggregator-procs-postgresql.xql	18 Jul 2018 17:04:31 -0000	1.6
+++ openacs-4/packages/news-aggregator/tcl/aggregator-procs-postgresql.xql	5 Oct 2021 11:51:45 -0000	1.7
@@ -3,65 +3,6 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="news_aggregator::aggregator::items_sql.items">
-      <querytext>
-	select s.source_id,
-               s.link,
-               s.description,
-               s.title,
-               to_char(i.creation_date, 'YYYY-MM-DD HH24:MI:SS') as last_scanned,
-               to_char(i.creation_date, 'YYYY-MM-DD HH24') as sort_date,
-	       s.feed_url,
-	       i.item_id,
-               i.title as item_title,
-               i.link as item_link,
-               i.description as item_description,
-               i.content_encoded,
-               i.guid as item_guid,
-               i.original_guid as item_original_guid,
-               i.permalink_p as item_permalink_p,
-               i.author as item_author,
-               to_char(i.pub_date at time zone 'UTC', 'YYYY-MM-DD HH24:MI:SS') as item_pub_date,
-               s.last_modified
-        from   (
-                   na_aggregators a join
-                   na_subscriptions su on (a.aggregator_id = su.aggregator_id)
-               ) join
-               na_items i on (su.source_id = i.source_id)
-               join na_sources s on (i.source_id = s.source_id)
-	where  a.package_id = :package_id
-        and    a.aggregator_id = :aggregator_id
-            $items_purges
-	order  by i.item_id desc
-	limit  $sql_limit
-</querytext>
-</fullquery>
-
-<partialquery name="news_aggregator::aggregator::items_sql.items_purges">
-    <querytext>
-	and    ((i.item_id > coalesce(a.aggregator_bottom, 0)) or
-		(i.item_id in (select item_id from na_saved_items
-			       where aggregator_id = :aggregator_id)))
-    </querytext>
-</partialquery>
-
-    <fullquery name="news_aggregator::aggregator::as_opml.subscriptions">
-        <querytext>
-	  select
-	  	feed_url,
-		link,
-		title,
-		description
-	  from
-	  	na_sources s,
-		na_subscriptions su
-	  where
-	  	s.source_id = su.source_id
-		and su.aggregator_id = :aggregator_id
-	  order by lower(title)
-	</querytext>
-    </fullquery>
-
     <fullquery name="news_aggregator::aggregator::delete.delete_aggregator">
           <querytext>
                 select na_aggregator__delete (
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.16 -r1.17
--- openacs-4/packages/news-aggregator/tcl/aggregator-procs.tcl	2 Apr 2019 10:54:02 -0000	1.16
+++ openacs-4/packages/news-aggregator/tcl/aggregator-procs.tcl	5 Oct 2021 11:51:45 -0000	1.17
@@ -154,15 +154,49 @@
     if purge_p is true.
 } {
     if { $purge_p } {
-        set items_purges [db_map items_purges]
+        set items_purges {
+            and    ((i.item_id > coalesce(a.aggregator_bottom, 0)) or
+                    (i.item_id in (select item_id from na_saved_items
+                                   where aggregator_id = :aggregator_id)))
+        }
     } else {
         set items_purges ""
     }
 
     set limit [parameter::get -package_id $package_id -parameter "number_of_items_shown"]
     set sql_limit [expr {$limit_multiple*$limit}]
 
-    set sql [db_map items]
+    set sql [subst -nocommands {
+	select s.source_id,
+               s.link,
+               s.description,
+               s.title,
+               to_char(i.creation_date, 'YYYY-MM-DD HH24:MI:SS') as last_scanned,
+               to_char(i.creation_date, 'YYYY-MM-DD HH24') as sort_date,
+	       s.feed_url,
+	       i.item_id,
+               i.title as item_title,
+               i.link as item_link,
+               i.description as item_description,
+               i.content_encoded,
+               i.guid as item_guid,
+               i.original_guid as item_original_guid,
+               i.permalink_p as item_permalink_p,
+               i.author as item_author,
+               to_char(i.pub_date at time zone 'UTC', 'YYYY-MM-DD HH24:MI:SS') as item_pub_date,
+               s.last_modified
+        from   (
+                   na_aggregators a join
+                   na_subscriptions su on (a.aggregator_id = su.aggregator_id)
+               ) join
+               na_items i on (su.source_id = i.source_id)
+               join na_sources s on (i.source_id = s.source_id)
+	where  a.package_id = :package_id
+        and    a.aggregator_id = :aggregator_id
+            $items_purges
+	order  by i.item_id desc
+	fetch first $sql_limit rows only
+    }]
     return $sql
 }
 
@@ -228,7 +262,20 @@
     set body_node [$doc createElement "body"]
     $doc_node appendChild $body_node
 
-    db_foreach subscriptions "" {
+    db_foreach subscriptions {
+	  select
+	  	feed_url,
+		link,
+		title,
+		description
+	  from
+	  	na_sources s,
+		na_subscriptions su
+	  where
+	  	s.source_id = su.source_id
+		and su.aggregator_id = :aggregator_id
+	  order by lower(title)
+    } {
         set node [$doc createElement "outline"]
         $node setAttribute text $title
         $node setAttribute description $description
@@ -442,7 +489,13 @@
 
     @author Simon Carstensen
 } {
-    return [db_list_of_lists select_aggregator_options {}]
+    return [db_list_of_lists select_aggregator_options {
+        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
+    }]
 }
 
 # Local variables:
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/news-aggregator/tcl/aggregator-procs.xql'.
Fisheye: No comparison available.  Pass `N' to diff?