Index: openacs-4/packages/acs-subsite/www/admin/site-map/mount-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/mount-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/site-map/mount-oracle.xql	21 Jun 2002 19:08:33 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/site-map/mount-oracle.xql	17 May 2003 10:01:14 -0000	1.3
@@ -5,48 +5,76 @@
 
     <fullquery name="packages_unmounted_select">
         <querytext>
-            select package_id, acs_object.name(package_id) as name
-            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
-            and not exists (select 1
-                            from site_nodes
-                            where object_id = package_id)
+            select p.package_id, 
+                   acs_object.name(p.package_id) as name,
+                   pt.pretty_name as package_pretty_name
+            from   apm_packages p,
+                   apm_package_types pt,
+                   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 (
+                    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 apm_package_version.sortable_version_name(v2.version_name) >
+                         apm_package_version.sortable_version_name(v.version_name)))
+            and    (
+                       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(p.package_key) = 0 or v.auto_mount is not null)
+            and    not exists (select 1
+                               from site_nodes
+                               where object_id = p.package_id)
             order by name
         </querytext>
     </fullquery>
 
     <fullquery name="packages_mounted_select">
         <querytext>
-            select package_id, acs_object.name(package_id) as name
-            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 exists (select 1
-                        from site_nodes
-                        where object_id = package_id)
+            select p.package_id, 
+                   acs_object.name(p.package_id) as name,
+                   pt.pretty_name as package_pretty_name
+            from   apm_packages p,
+                   apm_package_types pt
+            where  pt.package_key = p.package_key
+            and    (
+                       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    exists (select 1
+                           from site_nodes
+                           where object_id = p.package_id)
             order by name
         </querytext>
     </fullquery>
 
 
     <fullquery name="packages_singleton_select">
         <querytext>
-            select package_id, acs_object.name(package_id) as name
-            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
-            and not exists (select 1
-                            from site_nodes
-                            where object_id = package_id)
+            select p.package_id, 
+                   acs_object.name(p.package_id) as name,
+                   pt.pretty_name as package_pretty_name
+            from   apm_packages p,
+                   apm_package_types pt,
+                   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 (
+                    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 apm_package_version.sortable_version_name(v2.version_name) >
+                         apm_package_version.sortable_version_name(v.version_name)))
+            and    (
+                       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(p.package_key) = 1 and v.auto_mount is null)
+            and    not exists (select 1
+                               from site_nodes
+                               where object_id = p.package_id)
             order by name
         </querytext>
     </fullquery>