Index: openacs-4/packages/acs-subsite/www/admin/site-map/mount-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/mount-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/site-map/mount-postgresql.xql	11 Sep 2006 14:54:32 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/site-map/mount-postgresql.xql	18 Jun 2018 12:46:43 -0000	1.6
@@ -13,17 +13,17 @@
                    apm_package_versions v
             where  pt.package_key = p.package_key
             and    v.package_key = pt.package_key
-            and    (v.installed_p = 't' or v.enabled_p = 't' or not exists (
+            and    (v.installed_p or v.enabled_p or not exists (
                     select 1 from apm_package_versions v2
                     where v2.package_key = v.package_key
-                      and (v2.installed_p = 't' or v2.enabled_p = 't')
+                      and (v2.installed_p or v2.enabled_p)
                      and apm_package_version__sortable_version_name(v2.version_name) >
                          apm_package_version__sortable_version_name(v.version_name)))
             and    (
-                       acs_permission__permission_p(p.package_id, :user_id, 'read') = 't'
-                    or acs_permission__permission_p(p.package_id, acs__magic_object_id('the_public'), 'read') = 't'
+                       acs_permission__permission_p(p.package_id, :user_id, 'read')
+                    or acs_permission__permission_p(p.package_id, acs__magic_object_id('the_public'), 'read')
                    )
-            and    (apm_package__singleton_p(p.package_key) = 0 or coalesce(v.auto_mount,'') != '')
+            and    (not pt.singleton_p or v.auto_mount is not null)
             and    not exists (select 1
                                from site_nodes
                                where object_id = p.package_id)
@@ -41,8 +41,8 @@
                    apm_package_types pt
             where  pt.package_key = p.package_key
             and    (
-                       acs_permission__permission_p(p.package_id, :user_id, 'read') = 't'
-                    or acs_permission__permission_p(p.package_id, acs__magic_object_id('the_public'), 'read') = 't'
+                       acs_permission__permission_p(p.package_id, :user_id, 'read')
+                    or acs_permission__permission_p(p.package_id, acs__magic_object_id('the_public'), 'read')
                    )
             and    exists (select 1
                            from site_nodes
@@ -61,18 +61,17 @@
                    apm_package_versions v
             where  pt.package_key = p.package_key
             and    v.package_key = pt.package_key
-            and    (v.installed_p = 't' or v.enabled_p = 't' or not exists (
+            and    (v.installed_p or v.enabled_p or not exists (
                     select 1 from apm_package_versions v2
                     where v2.package_key = v.package_key
-                      and (v2.installed_p = 't' or v2.enabled_p = 't')
+                      and (v2.installed_p or v2.enabled_p)
                      and apm_package_version__sortable_version_name(v2.version_name) >
                          apm_package_version__sortable_version_name(v.version_name)))
             and    (
-                       acs_permission__permission_p(p.package_id, :user_id, 'read') = 't'
-                    or acs_permission__permission_p(p.package_id, acs__magic_object_id('the_public'), 'read') = 't'
+                       acs_permission__permission_p(p.package_id, :user_id, 'read')
+                    or acs_permission__permission_p(p.package_id, acs__magic_object_id('the_public'), 'read')
                    )
-            and    (apm_package__singleton_p(p.package_key) = 1 and coalesce(v.auto_mount,'') = '')
-            and    apm_package__singleton_p(p.package_key) = 1
+            and    (pt.singleton_p and v.auto_mount is null)
             and    not exists (select 1
                                from site_nodes
                                where object_id = p.package_id)