Index: openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql	16 Jul 2018 16:43:49 -0000	1.22
+++ openacs-4/packages/file-storage/www/folder-chunk-postgresql.xql	3 Sep 2024 15:37:38 -0000	1.23
@@ -1,35 +1,47 @@
 <?xml version="1.0"?>
+
 <queryset>
-  <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+  <rdbms><type>postgresql</type><version>8.4</version></rdbms>
+
   <fullquery name="select_folder_contents">
     <querytext>
+      select fs_objects.object_id,
+             fs_objects.mime_type,
+             fs_objects.name,
+             fs_objects.live_revision,
+             fs_objects.type,
+             fs_objects.pretty_type,
+             to_char(fs_objects.last_modified, 'YYYY-MM-DD HH24:MI:SS') as last_modified_ansi,
+             fs_objects.content_size,
+             fs_objects.url,
+             fs_objects.sort_key,
+             -fs_objects.sort_key as sort_key_desc,
+             fs_objects.file_upload_name,
+             fs_objects.title,
+             case
+               when :folder_path is null
+               then fs_objects.file_upload_name
+               else :folder_path || fs_objects.file_upload_name
+             end as file_url,
+             fs_objects.last_modified >= (current_timestamp - cast('$n_past_days days' as interval)) as new_p
+      from fs_objects
+      where fs_objects.object_id in (
+        select distinct(orig_object_id) from acs_permission.permission_p_recursive_array(array(
 
-            select fs_objects.object_id,
-                   fs_objects.mime_type,
-                   fs_objects.name,
-                   fs_objects.live_revision,
-                   fs_objects.type,
-                   fs_objects.pretty_type,
-                   to_char(fs_objects.last_modified, 'YYYY-MM-DD HH24:MI:SS') as last_modified_ansi,
-                   fs_objects.content_size,
-                   fs_objects.url,
-                   fs_objects.sort_key,
-                   -fs_objects.sort_key as sort_key_desc,
-                   fs_objects.file_upload_name,
-                   fs_objects.title,
-                   case
-                     when :folder_path is null
-                     then fs_objects.file_upload_name
-                     else :folder_path || fs_objects.file_upload_name
-                   end as file_url,
-                   fs_objects.last_modified >= (current_timestamp - cast('$n_past_days days' as interval)) as new_p
-            from fs_objects
-            where fs_objects.parent_id = :folder_id
-	    and   acs_permission__permission_p(fs_objects.object_id, :viewing_user_id, 'read')
+          select item_id
+            from cr_items i
+           where parent_id = :folder_id
+             and (:categories_p = 'f' or
+                  :category_id is null or
+                  i.item_id in (select object_id from category_object_map
+                                 where category_id = :category_id)
+                  )
 
-            $categories_limitation
-            $orderby
+          ), :viewing_user_id, 'read')
+        )
+      $orderby
 
     </querytext>
   </fullquery>
+
 </queryset>