Index: openacs-4/packages/acs-subsite/www/site-map/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/site-map/index-oracle.xql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/acs-subsite/www/site-map/index-oracle.xql 23 Nov 2004 18:43:15 -0000 1.1.2.1 +++ openacs-4/packages/acs-subsite/www/site-map/index-oracle.xql 8 Mar 2005 19:31:35 -0000 1.1.2.2 @@ -35,7 +35,8 @@ directory_p, parent_id, n_children, - decode(acs_permission.permission_p(object_id, :user_id, 'admin'), 't', 1, 0) object_admin_p + decode(acs_permission.permission_p(object_id, :user_id, 'admin'), 't', 1, 0) object_admin_p, + (select view_p from site_nodes_selection where node_id=site_map.node_id) as view_p from apm_packages p, (select node_id, site_node.url(node_id) as url, @@ -50,13 +51,16 @@ acs_object.name(object_id) as object_name, directory_p, parent_id - from site_nodes n,site_nodes_selection sn + from site_nodes n where (object_id is null or exists ( select 1 from acs_object_party_privilege_map ppm where ppm.object_id = n.object_id and ppm.party_id = :user_id - and ppm.privilege = 'read')) and sn.node_id=n.node_id + and ppm.privilege = 'read')) + and exists ( + select 1 from site_nodes_selection sn + where sn.node_id = n.node_id) start with node_id = nvl(:root_id, site_node.node_id('/')) connect by prior node_id = parent_id and parent_id in ([join $expand ", "])) site_map where site_map.object_id = p.package_id (+)