Index: openacs-4/packages/layout-managed-subsite/lib/add-applications.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-managed-subsite/lib/add-applications.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/layout-managed-subsite/lib/add-applications.xql	26 Nov 2008 11:10:23 -0000	1.1
+++ openacs-4/packages/layout-managed-subsite/lib/add-applications.xql	30 Nov 2008 13:15:02 -0000	1.2
@@ -2,12 +2,39 @@
 
 <queryset>
 
+  <fullquery name="get_services">
+    <querytext>
+      select apt.package_key
+      from apm_package_types apt
+      where exists (select 1
+                    from layout_includelets li
+                    where apt.package_key = li.application)
+        and apt.package_type = 'apm_service'
+      order by apt.package_key
+    </querytext>
+  </fullquery>
+
+  <fullquery name="get_service_includelets">
+    <querytext>
+      select li.title, count(*)
+      from layout_includelets li, layout_elements le
+      where le.package_id = :subsite_id
+        and le.includelet_name = li.name
+        and li.application = :package_key
+      group by li.title
+      order by li.title
+    </querytext>
+  </fullquery>
+
   <fullquery name="get_mounted_applications">
     <querytext>
       select distinct ap.package_key , ap.package_id
-      from layout_includelets li, apm_packages ap
-      where ap.package_id in ([join $package_id_list ,])
+      from layout_includelets li, apm_packages ap, site_nodes s, apm_package_types apt
+      where s.parent_id = :subsite_node_id
+        and s.object_id = ap.package_id
         and apm_package__is_child(li.application, ap.package_key)
+        and apt.package_key = ap.package_key
+        and apt.package_type = 'apm_application'
     </querytext>
   </fullquery>
 
@@ -27,10 +54,15 @@
       select apt.package_key
       from apm_package_types apt
       where exists (select 1
-                    from layout_includelets li
-                    where apt.package_key = li.application)
-        and not apt.package_key in ('[join $package_key_list "','"]')
+                    from layout_includelets li, site_nodes s
+                    where apm_package__is_child(li.application, apt.package_key))
+        and not exists (select 1
+                        from site_nodes s, apm_packages ap
+                        where s.parent_id = :subsite_node_id
+                          and s.object_id = ap.package_id
+                          and ap.package_key = apt.package_key)
         and apt.package_type = 'apm_application'
+      order by apt.package_key
     </querytext>
   </fullquery>