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 -N -r1.10 -r1.11
--- openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql 4 Dec 2002 09:54:15 -0000 1.10
+++ openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql 13 Jun 2018 10:07:07 -0000 1.11
@@ -6,12 +6,10 @@
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,
+ 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) as url_package_id,
fs_objects.object_id,
fs_objects.name,
fs_objects.file_upload_name,
@@ -26,30 +24,6 @@
-
-
- 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.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
-
-
-