Index: openacs-4/packages/acs-subsite/www/site-map/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/site-map/index-postgresql.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/site-map/index-postgresql.xql	2 Apr 2013 11:05:18 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/site-map/index-postgresql.xql	7 Aug 2017 23:47:59 -0000	1.4
@@ -19,44 +19,6 @@
     </fullquery>
 
     <fullquery name="nodes_select">
-        <querytext>
-            select package_id,
-                   package_key,
-                   pretty_name as package_pretty_name,
-                   apm_package_type__num_parameters(package_key) as parameter_count,
-                   node_id, url, parent_url, name, root_p, mylevel, object_id,
-                   directory_p, parent_id, n_children,
-                   p.instance_name as object_name,
-                   acs_permission__permission_p(object_id, :user_id, 'admin') as object_admin_p,
-		   (select view_p from site_nodes_selection where node_id=site_map.node_id) as view_p
-            from apm_packages p join apm_package_types using (package_key) right outer join
-                 (select n.node_id,
-                         site_node__url(n.node_id) as url,
-                         site_node__url(n.parent_id) as parent_url,
-                         n.name,
-                         case when exists (select 1 from site_nodes where parent_id = n.node_id) then 1 else 0 end as n_children,
-                         case when n.node_id = (select site_node__node_id('/', null)) then 1 else 0 end as root_p,
-                         (tree_level(n.tree_sortkey) - (select tree_level(n2.tree_sortkey) from site_nodes n2 where n2.node_id = (select coalesce(:root_id, site_node__node_id('/', null))))) as mylevel,
-                         n.object_id,
-                         n.directory_p,
-                         n.parent_id
-                  from site_nodes n, site_nodes n2,site_nodes_selection sn
-                  where (n.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 n2.node_id = (select coalesce(:root_id, site_node__node_id('/', null)))
-                  and n.tree_sortkey between n2.tree_sortkey and tree_right(n2.tree_sortkey)
-                  and (n.parent_id is null or n.parent_id in ([join $expand ", "]))) site_map
-            on site_map.object_id = p.package_id 
-            order by url
-        </querytext>
-    </fullquery>
-
-    <fullquery name="nodes_select">
         <rdbms><type>postgresql</type><version>8.4</version></rdbms>
         <querytext>
             select package_id,
@@ -92,23 +54,6 @@
     </fullquery>
 
     <fullquery name="services_select">
-        <querytext>
-            select package_id,
-                   ap.package_key,
-                   ap.instance_name,
-                   apm_package_type__num_parameters(ap.package_key) as parameter_count
-            from apm_packages ap,
-                 apm_package_types
-            where ap.package_key = apm_package_types.package_key
-            and package_type = 'apm_service'
-            and not exists (select 1 from site_nodes sn where sn.object_id = package_id)
-            and exists (select 1 from acs_object_party_privilege_map ppm 
-                        where ppm.object_id = package_id and ppm.party_id = :user_id and ppm.privilege = 'admin')
-            order by instance_name
-        </querytext>
-    </fullquery>
-
-    <fullquery name="services_select">
         <rdbms><type>postgresql</type><version>8.4</version></rdbms>
         <querytext>
             select package_id,