Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/Attic/subsite-procs.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.xql	10 Oct 2001 06:56:44 -0000	1.3
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.xql	17 May 2003 09:58:37 -0000	1.4
@@ -1,9 +1,21 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="subsite::configure.subsite_name_query">      
+<fullquery name="subsite::after_mount.group_exists">      
       <querytext>
       
+	    select 1
+            from dual
+            where exists (select 1
+                          from application_groups
+                          where package_id = :package_id)
+	
+      </querytext>
+</fullquery>
+
+<fullquery name="subsite::after_mount.subsite_name_query">      
+      <querytext>
+      
 	    select instance_name
 	    from apm_packages
 	    where package_id = :package_id
@@ -12,18 +24,16 @@
 </fullquery>
 
  
-<fullquery name="subsite::configure.parent_subsite_query">      
+<fullquery name="subsite::after_mount.parent_subsite_query">      
       <querytext>
       
-		select m.group_id as supersite_group_id,
-                       p.instance_name as supersite_name
-		from application_group_element_map m,
-                     apm_packages p
-		where p.package_id = m.package_id
-                  and container_id = group_id
-                  and element_id = :subsite_group_id
-                  and rel_type = 'composition_rel'
-	    
+         select m.group_id as supersite_group_id, p.instance_name as supersite_name
+         from application_groups m, apm_packages p, site_nodes s1, site_nodes s2
+         where s1.node_id = :node_id
+           and s2.node_id = s1.parent_id
+           and p.package_id = s2.object_id
+	   and m.package_id = s2.object_id 
+
       </querytext>
 </fullquery>