Index: openacs-4/packages/file-storage/tcl/file-storage-rss-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-rss-procs-oracle.xql,v
diff -u -r1.2 -r1.2.16.1
--- openacs-4/packages/file-storage/tcl/file-storage-rss-procs-oracle.xql	13 Jan 2005 13:58:12 -0000	1.2
+++ openacs-4/packages/file-storage/tcl/file-storage-rss-procs-oracle.xql	5 Oct 2021 10:04:44 -0000	1.2.16.1
@@ -10,38 +10,6 @@
                       connect by prior item_id = parent_id
                       start with item_id = :folder_id)
     </querytext>
-  </fullquery>
+  </partialquery>
 
-  <fullquery name="fs::rss::datasource.select_files">
-    <querytext>
-        select * from (
-          select o.object_id as item_id,
-                 o.title,
-                 o.name,
-                 o.file_upload_name,
-                 o.type,
-                 o.content_size,
-                 to_char(o.last_modified,'YYYY-MM-DD HH24:MI:SS') as publish_date_ansi,
-                 r.description,
-                 r.revision_id
-          from fs_objects o,
-               cr_revisions r
-          where $parent_clause
-            and type != 'folder'
-            and $revisions_clause
-          order by last_modified desc
-        ) where rownum < :max_items + 1
-    </querytext>
-  </fullquery>
-
-  <fullquery name="fs::rss::lastUpdated.select_last_updated">
-    <querytext>
-	select (max(last_modified)-to_date('1970-01-01','YYYY-MM-DD'))*60*60*24 as last_update
-        from fs_rss_subscrs s, fs_objects f
-        where s.subscr_id = :summary_context_id
-          and f.parent_id = s.folder_id
-          and f.type != 'folder'
-    </querytext>
-  </fullquery>
-
 </queryset>
Index: openacs-4/packages/file-storage/tcl/file-storage-rss-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-rss-procs-postgresql.xql,v
diff -u -r1.3 -r1.3.16.1
--- openacs-4/packages/file-storage/tcl/file-storage-rss-procs-postgresql.xql	4 Mar 2005 23:13:30 -0000	1.3
+++ openacs-4/packages/file-storage/tcl/file-storage-rss-procs-postgresql.xql	5 Oct 2021 10:04:44 -0000	1.3.16.1
@@ -14,38 +14,6 @@
                       between parent.tree_sortkey
                       and tree_right(parent.tree_sortkey)) 
     </querytext>
-  </fullquery>
+  </partialquery>
 
-  <fullquery name="fs::rss::datasource.select_files">
-    <querytext>
-        select * from (
-          select o.object_id as item_id,
-                 o.title,
-                 o.name,
-                 o.file_upload_name,
-                 o.type,
-                 o.content_size,
-                 to_char(r.publish_date,'YYYY-MM-DD HH24:MI:SS') as publish_date_ansi,
-                 r.description,
-                 r.revision_id
-          from fs_objects o,
-               cr_revisions r
-          where $parent_clause
-            and type != 'folder'
-            and $revisions_clause
-          order by last_modified desc
-        ) as v limit $max_items
-    </querytext>
-  </fullquery>
-
-  <fullquery name="fs::rss::lastUpdated.select_last_updated">
-    <querytext>
-	select (max(last_modified)-to_date('1970-01-01','YYYY-MM-DD'))*60*60*24 as last_update
-        from fs_rss_subscrs s, fs_objects f
-        where s.subscr_id = :summary_context_id
-          and f.parent_id = s.folder_id
-          and f.type != 'folder'
-    </querytext>
-  </fullquery>
-
-</queryset>
\ No newline at end of file
+</queryset>
Index: openacs-4/packages/file-storage/tcl/file-storage-rss-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-rss-procs.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/file-storage/tcl/file-storage-rss-procs.tcl	5 Oct 2021 09:56:55 -0000	1.7.2.1
+++ openacs-4/packages/file-storage/tcl/file-storage-rss-procs.tcl	5 Oct 2021 10:04:44 -0000	1.7.2.2
@@ -100,7 +100,25 @@
         set revisions_clause "r.item_id = o.object_id"
     }
 
-    db_foreach select_files {} {
+    db_foreach select_files [subst -nocommands {
+        select * from (
+          select o.object_id as item_id,
+                 o.title,
+                 o.name,
+                 o.file_upload_name,
+                 o.type,
+                 o.content_size,
+                 to_char(r.publish_date,'YYYY-MM-DD HH24:MI:SS') as publish_date_ansi,
+                 r.description,
+                 r.revision_id
+          from fs_objects o,
+               cr_revisions r
+          where $parent_clause
+            and type != 'folder'
+            and $revisions_clause
+          order by last_modified desc
+        ) as v fetch first :max_items rows only
+    }] {
         set link "${ad_url}${base_url}file?file_id=$item_id&version_id=$revision_id"
         set content "content"
         set description $description
@@ -162,7 +180,13 @@
 
     #result differs on whether we're including revisions
 
-    db_1row select_last_updated {}
+    db_1row select_last_updated {
+	select (max(last_modified)-to_date('1970-01-01','YYYY-MM-DD'))*60*60*24 as last_update
+        from fs_rss_subscrs s, fs_objects f
+        where s.subscr_id = :summary_context_id
+          and f.parent_id = s.folder_id
+          and f.type != 'folder'
+    }
 
     return $last_update
 }