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.11 -r1.12
--- openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	2 Apr 2002 07:00:53 -0000	1.11
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	4 Apr 2002 03:01:06 -0000	1.12
@@ -41,39 +41,21 @@
 
     <fullquery name="fs::get_folder_contents.get_folder_contents">
         <querytext>
-            (select fs_folders_and_files.file_id,
-                   'f' as url_p,
-                   't' as versioned_p,
-                   fs_folders_and_files.name,
-                   fs_folders_and_files.live_revision,
-                   fs_folders_and_files.type,
-                   to_char(fs_folders_and_files.last_modified, 'YYYY-MM-DD HH24:MI') as last_modified,
-                   case when fs_folders_and_files.last_modified >= (sysdate - :n_past_days) then 1 else 0 end as new_p,
-                   fs_folders_and_files.content_size,
-                   decode(acs_permission.permission_p(fs_folders_and_files.file_id, :user_id, 'write'), 'f', 0, 1) as write_p,
-                   decode(acs_permission.permission_p(fs_folders_and_files.file_id, :user_id, 'delete'), 'f', 0, 1) as delete_p,
-                   decode(acs_permission.permission_p(fs_folders_and_files.file_id, :user_id, 'admin'), 'f', 0, 1) as admin_p
-            from fs_folders_and_files
-            where fs_folders_and_files.parent_id = :folder_id
-            and 't' = acs_permission.permission_p(fs_folders_and_files.file_id, :user_id, 'read'))
-            union
-            (select fs_simple_objects.object_id as file_id,
-            't' as url_p,
-            'f' as versioned_p,
-            fs_simple_objects.name,
-            0 as live_revision,
-            'url' as type,
-            NULL as last_modified,
-            0 as new_p,
-            0 as content_size,
-            decode(acs_permission.permission_p(fs_simple_objects.object_id, :user_id, 'write'), 'f', 0,1) as write_p,
-            decode(acs_permission.permission_p(fs_simple_objects.object_id, :user_id, 'delete'), 'f', 0, 1) as delete_p,
-            decode(acs_permission.permission_p(fs_simple_objects.object_id, :user_id, 'admin'), 'f', 0, 1) as admin_p
-            from fs_simple_objects
-            where folder_id= :folder_id
-            and 't' = acs_permission.permission_p(fs_simple_objects.object_id, :user_id, 'read'))
-
-            order by name
+            select fs_objects.object_id,
+                   fs_objects.name,
+                   fs_objects.live_revision,
+                   fs_objects.type,
+                   to_char(fs_objects.last_modified, 'Month DD YYYY HH24:MI') as last_modified,
+                   case when fs_objects.last_modified >= (sysdate - :n_past_days) then 1 else 0 end as new_p,
+                   fs_objects.content_size,
+                   decode(acs_permission.permission_p(fs_objects.object_id, :user_id, 'write'), 'f', 0, 1) as write_p,
+                   decode(acs_permission.permission_p(fs_objects.object_id, :user_id, 'delete'), 'f', 0, 1) as delete_p,
+                   decode(acs_permission.permission_p(fs_objects.object_id, :user_id, 'admin'), 'f', 0, 1) as admin_p
+            from fs_objects
+            where fs_objects.parent_id = :folder_id
+            and 't' = acs_permission.permission_p(fs_objects.object_id, :user_id, 'read')
+            order by fs_objects.sort_key,
+                     fs_objects.name
         </querytext>
     </fullquery>