Index: openacs-4/packages/news-aggregator/www/subscriptions-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/subscriptions-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news-aggregator/www/subscriptions-postgresql.xql	28 Aug 2003 09:41:57 -0000	1.2
+++ openacs-4/packages/news-aggregator/www/subscriptions-postgresql.xql	20 Mar 2004 11:12:29 -0000	1.3
@@ -3,13 +3,34 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="delete_source">
-      <querytext>
-        select na_source__delete(
-                :delete_id
-        );
+    <fullquery name="sources">
+        <querytext>
+                    select s.title,
+			   s.source_id,
+			   s.feed_url,
+			   s.link,
+			   s.description,
+			   s.updates,
+                           to_char(s.last_scanned, 'YYYY-MM-DD HH24:MI') as last_scanned,
+                           to_char(s.last_modified_stamp, 'YYYY-MM-DD HH24:MI') as last_modified
+                    from   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 = :package_id
+                    and    a.aggregator_id = :aggregator_id
+                    [ad_decode source "" "" [template::list::orderby_clause -orderby -name sources]]
+        </querytext>
+    </fullquery>
 
-      </querytext>
-</fullquery>
+    <fullquery name="delete_source">
+        <querytext>
+                select na_source__delete(
+                        :delete_id
+                );
 
+        </querytext>
+    </fullquery>
+
 </queryset>