Index: openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	22 Feb 2002 21:37:12 -0000	1.6
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	22 Feb 2002 22:12:10 -0000	1.7
@@ -73,30 +73,6 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="fs::get_folder_contents_count.get_folder_contents_count">
-        <querytext>
-            select count(*)
-            from (
-                  select 1
-                  from cr_items,
-                       cr_revisions,
-                       acs_objects
-                  where cr_items.parent_id = :folder_id
-                  and cr_items.content_type = 'file_storage_object'
-                  and 't' = acs_permission.permission_p(cr_items.item_id, :user_id, 'read')
-                  and cr_items.item_id = acs_objects.object_id
-                  and cr_items.live_revision = cr_revisions.revision_id(+)
-                  union
-                  select 1
-                  from cr_items,
-                       cr_folders
-                  where cr_items.parent_id = :folder_id
-                  and cr_items.item_id = cr_folders.folder_id
-                  and 't' = acs_permission.permission_p(cr_folders.folder_id, :user_id, 'read')
-                 ) foo
-        </querytext>
-    </fullquery>
-
 <fullquery name="fs_get_folder_name.folder_name">      
       <querytext>
       
Index: openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	22 Feb 2002 21:37:12 -0000	1.13
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	22 Feb 2002 22:12:10 -0000	1.14
@@ -61,26 +61,6 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="fs::get_folder_contents_count.get_folder_contents_count">
-        <querytext>
-            select count(*)
-            from (
-                  select 1
-                  from cr_items i left join cr_revisions r on (i.live_revision = r.revision_id), acs_objects o
-                  where i.item_id = o.object_id
-                  and i.parent_id = :folder_id
-                  and acs_permission__permission_p(i.item_id, :user_id, 'read') = 't'
-                  and i.content_type = 'file_storage_object'
-                  union
-                  select 1
-                  from cr_items i, cr_folders f
-                  where i.item_id = f.folder_id
-                  and i.parent_id = :folder_id
-                  and acs_permission__permission_p(f.folder_id, :user_id, 'read') = 't'
-                 ) foo
-        </querytext>
-    </fullquery>
-
 <fullquery name="fs_get_folder_name.folder_name">      
       <querytext>
 
Index: openacs-4/packages/file-storage/tcl/file-storage-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/tcl/file-storage-procs.xql	21 Feb 2002 20:06:27 -0000	1.2
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.xql	22 Feb 2002 22:12:10 -0000	1.3
@@ -49,4 +49,12 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="fs::get_folder_contents_count.get_folder_contents_count">
+        <querytext>
+            select count(*)
+            from cr_items
+            where cr_items.parent_id = :folder_id
+        </querytext>
+    </fullquery>
+
 </queryset>