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.6 -r1.7
--- openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql	4 Apr 2002 03:01:52 -0000	1.6
+++ openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql	7 Apr 2002 01:13:29 -0000	1.7
@@ -3,26 +3,23 @@
 <queryset>
 <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-    <fullquery name="select_files_and_folders">
+    <fullquery name="select_fs_objects">
         <querytext>
-            select fs_objects.object_id,
+            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,
+                   fs_objects.object_id,
                    fs_objects.name,
                    fs_objects.live_revision,
                    fs_objects.type,
                    fs_objects.content_size
             from fs_objects
-            where fs_objects.object_id = :my_folder_id
+            where fs_objects.object_id in ([join $list_of_folder_ids ", "])
             and 't' = acs_permission.permission_p(fs_objects.object_id, :user_id, 'read')
             order by fs_objects.sort_key,
                      fs_objects.name
         </querytext>
     </fullquery>
 
-    <fullquery name="select_package_id">
-        <querytext>
-            select file_storage.get_package_id(:my_folder_id)
-            from dual
-        </querytext>
-    </fullquery>
-
 </queryset>
Index: openacs-4/packages/fs-portlet/www/fs-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/fs-portlet/www/fs-portlet.tcl	29 Mar 2002 19:25:48 -0000	1.4
+++ openacs-4/packages/fs-portlet/www/fs-portlet.tcl	7 Apr 2002 01:13:29 -0000	1.5
@@ -29,27 +29,6 @@
 set user_id [ad_conn user_id]
 set list_of_folder_ids $config(folder_id)
 
-# set up the multirow datasource using the db_multirow proc and 1 id
-set my_folder_id [lindex $list_of_folder_ids 0]
+db_multirow folders select_fs_objects {}
 
-db_multirow -local folders select_files_and_folders {} {
-
-    # we can set array vars for this row
-    set folders(url) [site_nodes::get_url_from_package_id \
-        -package_id [db_string select_package_id {}] \
-    ]       
-
-}
-
-foreach my_folder_id [lrange $list_of_folder_ids 1 end] {  
-
-    # use the append switch to add rows to the datasource
-    db_multirow -local -append folders select_files_and_folders {} {        
-        set folders(url) [site_nodes::get_url_from_package_id \
-            -package_id [db_string select_package_id {}] \
-        ]        
-    }
-
-}
-
 ad_return_template