Index: openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql	7 Apr 2002 01:13:29 -0000	1.7
+++ openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql	25 Apr 2002 20:34:38 -0000	1.8
@@ -3,12 +3,15 @@
 <queryset>
 <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-    <fullquery name="select_fs_objects">
+    <fullquery name="select_folders">
         <querytext>
             select file_storage.get_package_id(fs_objects.object_id) as package_id,
-                   (select site_node.url(site_nodes.node_id)
-                    from site_nodes
-                    where site_nodes.object_id = file_storage.get_package_id(fs_objects.object_id)) as url,
+                   decode(fs_objects.type, 'URL', (select site_node.url(site_nodes.node_id)
+                                                   from site_nodes
+                                                   where site_nodes.object_id = file_storage.get_package_id(fs_objects.parent_id)),
+                                           (select site_node.url(site_nodes.node_id)
+                                            from site_nodes
+                                            where site_nodes.object_id = file_storage.get_package_id(fs_objects.object_id))) as url,
                    fs_objects.object_id,
                    fs_objects.name,
                    fs_objects.live_revision,
@@ -22,4 +25,27 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="select_folder_contents">
+        <querytext>
+            select file_storage.get_package_id(fs_objects.object_id) as package_id,
+                   decode(fs_objects.type, 'URL', (select site_node.url(site_nodes.node_id)
+                                                   from site_nodes
+                                                   where site_nodes.object_id = file_storage.get_package_id(fs_objects.parent_id)),
+                                           (select site_node.url(site_nodes.node_id)
+                                            from site_nodes
+                                            where site_nodes.object_id = file_storage.get_package_id(fs_objects.object_id))) as url,
+                   fs_objects.object_id,
+                   fs_objects.name,
+                   fs_objects.live_revision,
+                   fs_objects.type,
+                   fs_objects.content_size
+            from fs_objects
+            where fs_objects.parent_id in ([join $list_of_folder_ids ", "])
+            and 't' = acs_permission.permission_p(fs_objects.object_id, :user_id, 'read')
+            order by fs_objects.parent_id,
+                     fs_objects.sort_key,
+                     fs_objects.name
+        </querytext>
+    </fullquery>
+
 </queryset>