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.3 -r1.4
--- openacs-4/packages/news-aggregator/tcl/aggregator-procs-postgresql.xql	18 Jul 2018 10:31:09 -0000	1.3
+++ openacs-4/packages/news-aggregator/tcl/aggregator-procs-postgresql.xql	18 Jul 2018 16:23:16 -0000	1.4
@@ -79,47 +79,6 @@
 	</querytext>
     </fullquery>
 
-    <fullquery name="news_aggregator::aggregator::purge.count_purges">
-        <querytext>
-		select count(purge_id)
-		from na_purges
-		where aggregator_id = :aggregator_id
-	</querytext>
-    </fullquery>
-
-    <fullquery name="news_aggregator::aggregator::purge.get_range">
-    	<querytext>
-		select max(top) as max_top, min(bottom) as min_bottom,
-			nextval('na_purges_seq') as purge_id
-		from na_purges
-		where aggregator_id = :aggregator_id
-	</querytext>
-    </fullquery>
-
-    <fullquery name="news_aggregator::aggregator::purge.aggregator_purge">
-    	<querytext>
-		update na_aggregators
-		set aggregator_bottom = :aggregator_bottom
-		where aggregator_id = :aggregator_id
-	</querytext>
-    </fullquery>
-
-    <fullquery name="news_aggregator::aggregator::purge.purge_all_purges">
-        <querytext>
-		delete from na_purges
-		where aggregator_id = :aggregator_id
-	</querytext>
-    </fullquery>
-
-    <fullquery name="news_aggregator::aggregator::purge.insert_purge">
-        <querytext>
-		insert into na_purges
-			(purge_id, top, bottom, aggregator_id, purge_date)
-		values
-			(:purge_id, :top, :bottom, :aggregator_id, now())
-	</querytext>
-    </fullquery>
-
     <fullquery name="news_aggregator::aggregator::set_user_default.create_pref">
     	<querytext>
 		insert into na_user_preferences
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.11 -r1.12
--- openacs-4/packages/news-aggregator/tcl/aggregator-procs.tcl	18 Jul 2018 16:13:06 -0000	1.11
+++ openacs-4/packages/news-aggregator/tcl/aggregator-procs.tcl	18 Jul 2018 16:23:16 -0000	1.12
@@ -250,24 +250,37 @@
     db_transaction {
         # Find out how many purges the aggregator has
         # and clear some if there are too many
-        set purge_count [db_string count_purges ""]
+        set purge_count [db_string count_purges {
+            select count(purge_id) from na_purges
+            where aggregator_id = :aggregator_id
+        }]
         set max_purges [parameter::get -parameter "max_purges"]
         if { $purge_count > $max_purges } {
-            db_1row get_range ""
-	    db_dml purge_all_purges ""
+	    db_dml purge_all_purges {
+                delete from na_purges
+		where aggregator_id = :aggregator_id
+            }
 
 	    # The aggregator's bottom is set to the argument
 	    # top because aggregator_bottom is actually the
 	    # highest-numbered item to be displayed. Yes, it
 	    # is confusing.
 	    set aggregator_bottom $top
-	    db_dml aggregator_purge ""
-
+	    db_dml aggregator_purge {
+		update na_aggregators
+		set aggregator_bottom = :aggregator_bottom
+		where aggregator_id = :aggregator_id
+            }
 	    return
         }
 
         set purge_id [db_nextval na_purges_seq]
-	db_dml insert_purge ""
+	db_dml insert_purge {
+            insert into na_purges
+                    (purge_id, top, bottom, aggregator_id, purge_date)
+            values
+                    (:purge_id, :top, :bottom, :aggregator_id, current_timestamp)
+        }
     }
 }