Index: openacs-4/packages/acs-subsite/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/Attic/index-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/index-postgresql.xql	17 May 2003 09:58:56 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/index-postgresql.xql	2 Oct 2003 22:04:46 -0000	1.6
@@ -3,23 +3,17 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="name">      
-      <querytext>
-      
-    select acs_object__name(:package_id) 
-
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="site_nodes">      
       <querytext>
 
   select site_node__url(n.node_id) as url, acs_object__name(n.object_id) as name
-    from site_nodes n
+    from site_nodes n, apm_packages p, apm_package_types t
    where n.parent_id = :node_id
-    and n.object_id is not null
     and acs_permission__permission_p(n.object_id, :user_id, 'read') = 't'
+    and p.package_id = n.object_id
+    and t.package_key = p.package_key
+    and t.package_type = 'apm_service'
+    and t.package_key != 'acs-subsite'        
    order by name
 
       </querytext>