Index: openacs-4/packages/fs-portlet/www/fs-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/fs-portlet/www/fs-portlet-postgresql.xql	4 Dec 2002 09:54:15 -0000	1.2
+++ openacs-4/packages/fs-portlet/www/fs-portlet-postgresql.xql	13 Jun 2018 10:07:07 -0000	1.3
@@ -6,15 +6,10 @@
     <fullquery name="select_folders">
         <querytext>
             select file_storage__get_package_id(fs_objects.object_id) as package_id,
-                   (CASE 
-                       WHEN fs_objects.type = 'url'
-                       THEN (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))
-                       ELSE (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))
-                   END) as url,
+                   case when fs_objects.type = 'url' then
+                      file_storage__get_package_id(fs_objects.parent_id)
+                   else
+                      file_storage__get_package_id(fs_objects.object_id) end as url_package_id,
                    fs_objects.object_id,
                    fs_objects.name,
                    fs_objects.file_upload_name,
@@ -23,37 +18,10 @@
                    fs_objects.content_size
             from fs_objects
             where fs_objects.object_id in ([join $list_of_folder_ids ", "])
-            and 't' = acs_permission__permission_p(fs_objects.object_id, :user_id, 'read')
+            and 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_folder_contents">
-        <querytext>
-            select file_storage__get_package_id(fs_objects.object_id) as package_id,
-                   (CASE
-                      WHEN fs_objects.type = 'url'
-                      THEN (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))
-                      ELSE (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))
-                   END) as url,
-                   fs_objects.object_id,
-                   fs_objects.name,
-                   fs_objects.file_upload_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>