Index: openacs-4/packages/news-aggregator/tcl/source-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/source-procs-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news-aggregator/tcl/source-procs-postgresql.xql	20 Mar 2004 13:21:00 -0000	1.2
+++ openacs-4/packages/news-aggregator/tcl/source-procs-postgresql.xql	20 Mar 2004 14:06:45 -0000	1.3
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 
 <queryset>
-   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
 <fullquery name="news_aggregator::source::update.update_source_no_new">
     <querytext>
@@ -14,13 +13,6 @@
     </querytext>
 </fullquery>
 
-<fullquery name="news_aggregator::source::update_all.source_count">
-    <querytext>
-        select count(*)
-        from na_sources
-    </querytext>
-</fullquery>
-
 <fullquery name="news_aggregator::source::update_all.sources">
       <querytext>
         select source_id,
@@ -40,17 +32,6 @@
 </partialquery>
 
 
-<fullquery name="news_aggregator::source::update.items">
-    <querytext>
-        select  guid, original_guid, i.title, i.description
-        from    na_items i join
-                na_sources s on (i.source_id = s.source_id)
-        where   s.feed_url = :feed_url
-        and     guid in ($guids)   
-	order by i.item_id asc
-    </querytext>
-</fullquery>
-
 <fullquery name="news_aggregator::source::new.add_source">
         <querytext>
             select na_source__new (
Index: openacs-4/packages/news-aggregator/tcl/source-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/Attic/source-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/news-aggregator/tcl/source-procs.xql	20 Mar 2004 11:04:39 -0000	1.1
+++ openacs-4/packages/news-aggregator/tcl/source-procs.xql	20 Mar 2004 14:06:45 -0000	1.2
@@ -2,6 +2,25 @@
 
 <queryset>
 
+<fullquery name="news_aggregator::source::update.items">
+    <querytext>
+        select  guid, original_guid, i.title, i.description
+        from    na_items i join
+                na_sources s on (i.source_id = s.source_id)
+        where   s.feed_url = :feed_url
+        and     guid in ($guids)   
+	order by i.item_id asc
+    </querytext>
+</fullquery>
+
+
+<fullquery name="news_aggregator::source::update_all.source_count">
+    <querytext>
+        select count(*)
+        from na_sources
+    </querytext>
+</fullquery>
+
 <fullquery name="news_aggregator::source::new.source">
       <querytext>
         select source_id
Index: openacs-4/packages/news-aggregator/tcl/subscription-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/Attic/subscription-procs-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/news-aggregator/tcl/subscription-procs-postgresql.xql	20 Mar 2004 14:06:45 -0000	1.1
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+    <fullquery name="news_aggregator::subscription::copy.copy_subscription">
+          <querytext>
+            insert into na_subscriptions (
+                aggregator_id,
+                source_id,
+                creation_date
+            ) values (
+                :copy_to,
+                :source_id,
+                now()
+            )
+          </querytext>
+    </fullquery>
+
+    <fullquery name="news_aggregator::subscription::new.insert_subscription">
+          <querytext>
+            insert into na_subscriptions (
+                aggregator_id,
+                source_id,
+                creation_date
+            ) values (
+                :aggregator_id,
+                :source_id,
+                now()
+            )
+          </querytext>
+    </fullquery>
+</queryset>
Index: openacs-4/packages/news-aggregator/tcl/subscription-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/Attic/subscription-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/news-aggregator/tcl/subscription-procs.xql	20 Mar 2004 11:04:39 -0000	1.1
+++ openacs-4/packages/news-aggregator/tcl/subscription-procs.xql	20 Mar 2004 14:06:45 -0000	1.2
@@ -2,19 +2,6 @@
 
 <queryset>
 
-    <fullquery name="news_aggregator::subscription::new.insert_subscription">
-          <querytext>
-            insert into na_subscriptions (
-                aggregator_id,
-                source_id,
-                creation_date
-            ) values (
-                :aggregator_id,
-                :source_id,
-                now()
-            )
-          </querytext>
-    </fullquery>
 
     <fullquery name="news_aggregator::subscription::new.subscription_exists_p">
           <querytext>
@@ -42,18 +29,4 @@
           </querytext>
     </fullquery>
 
-    <fullquery name="news_aggregator::subscription::copy.copy_subscription">
-          <querytext>
-            insert into na_subscriptions (
-                aggregator_id,
-                source_id,
-                creation_date
-            ) values (
-                :copy_to,
-                :source_id,
-                now()
-            )
-          </querytext>
-    </fullquery>
-
 </queryset>