Index: openacs-4/packages/news-aggregator/tcl/apm-callback-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/Attic/apm-callback-procs.xql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/news-aggregator/tcl/apm-callback-procs.xql	28 Dec 2005 17:55:43 -0000	1.1.2.1
+++ openacs-4/packages/news-aggregator/tcl/apm-callback-procs.xql	14 Jan 2006 23:27:59 -0000	1.1.2.2
@@ -2,7 +2,7 @@
 
 <queryset>
 
-<fullquery name="news_aggregator::install::before_uninstantiate.select_instance_aggregators">
+<fullquery name="news_aggregator::apm::before_uninstantiate.select_instance_aggregators">
       <querytext>
 	select a.aggregator_id 
           from acs_objects o, na_aggregators a 
@@ -11,13 +11,12 @@
         </querytext>
     </fullquery>
 
-<fullquery name="news_aggregator::install::before_uninstantiate.select_instance_sources">
+<fullquery name="news_aggregator::apm::before_uninstantiate.select_unused_sources">
       <querytext>
-	select s.source_id
-          from acs_objects o, na_sources s
-         where s.source_id = o.object_id
-           and o.context_id = :package_id
+         select s.source_id from na_sources s where source_id not in (
+                 select distinct source_id from na_subscriptions 
+        )
         </querytext>
     </fullquery>
 
-</queryset>
\ No newline at end of file
+</queryset>