Index: openacs-4/packages/acs-subsite/www/admin/site-map/unmounted-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/unmounted-postgresql.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/site-map/unmounted-postgresql.xql	27 Oct 2014 16:39:57 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/site-map/unmounted-postgresql.xql	18 Jun 2018 13:17:59 -0000	1.5
@@ -5,11 +5,12 @@
 
     <fullquery name="packages_normal_select">
         <querytext>
-            select package_id, acs_object__name(package_id) as name, package_key
-            from apm_packages
-            where (acs_permission__permission_p(package_id, :user_id, 'read') = 't' or
-                    acs_permission__permission_p(package_id, acs__magic_object_id('the_public'), 'read') = 't')
-            and apm_package__singleton_p(package_key) = 0
+            select package_id, instance_name as name, package_key
+            from apm_packages p
+            where (acs_permission__permission_p(package_id, :user_id, 'read') or
+                    acs_permission__permission_p(package_id, acs__magic_object_id('the_public'), 'read'))
+            and not (select singleton_p from apm_package_types
+                      where package_key = p.package_key)
             and not exists (select 1
                             from site_nodes
                             where object_id = package_id)
@@ -19,11 +20,12 @@
 
     <fullquery name="packages_singleton_select">
         <querytext>
-            select package_id, acs_object__name(package_id) as name, package_key
-            from apm_packages
-            where (acs_permission__permission_p(package_id, :user_id, 'read') = 't' or
-                    acs_permission__permission_p(package_id, acs__magic_object_id('the_public'), 'read') = 't')
-            and apm_package__singleton_p(package_key) = 1
+            select package_id, instance_name as name, package_key
+            from apm_packages p
+            where (acs_permission__permission_p(package_id, :user_id, 'read') or
+                    acs_permission__permission_p(package_id, acs__magic_object_id('the_public'), 'read'))
+            and (select singleton_p from apm_package_types
+                  where package_key = p.package_key)
             and not exists (select 1
                             from site_nodes
                             where object_id = package_id)