Index: openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql	30 Apr 2001 20:11:24 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql	13 May 2001 18:31:13 -0000	1.3
@@ -6,12 +6,14 @@
 <fullquery name="path_select">      
       <querytext>
       
-  select node_id, name, directory_p, tree_level(tree_sortkey) as level,
-         acs_object__name(object_id) as obj_name,
-         acs_permission__permission_p(object_id, :user_id, 'admin') as admin_p
-  from site_nodes
-  where tree_sortkey like (select tree_sortkey from site_nodes where node_id = :root_id) || '%'
-  order by level desc
+  select s2.node_id, s2.name, s2.directory_p, tree_level(s2.tree_sortkey) as level,
+	 acs_object__name(s2.object_id) as obj_name,
+	 acs_permission__permission_p(s2.object_id, :user_id, 'admin') as admin_p
+    from site_nodes s1, site_nodes s2
+   where s1.node_id = :root_id
+     and s2.tree_sortkey <= s1.tree_sortkey
+     and s1.tree_sortkey like (s2.tree_sortkey || '%')
+   order by level
 
       </querytext>
 </fullquery>
@@ -29,7 +31,7 @@
 select package_id,
        package_key,
        apm_package_type__num_parameters(package_key) as parameter_count,
-       node_id, url, parent_url, name, root_p, mylevel - 1 as mylevel, object_id,
+       node_id, url, parent_url, name, root_p, mylevel, object_id,
        object_name, directory_p, parent_id, n_children,
        (select case when acs_permission__permission_p(object_id, :user_id, 'admin') = 't' then 1 else 0 end) as object_admin_p
 from apm_packages p right outer join (
@@ -40,8 +42,9 @@
           from site_nodes
           where parent_id = n.node_id) as n_children,
          case when node_id = site_node__node_id('/', null) then 1 else 0 end as root_p,
-         tree_level(tree_sortkey) as mylevel,
-	 tree_sortkey,
+         (select tree_level(n.tree_sortkey) - tree_level(n2.tree_sortkey)
+            from site_nodes n2
+           where n2.node_id = coalesce(:root_id, site_node__node_id('/', null))) as mylevel,
          object_id,
          acs_object__name(object_id) as object_name,
          directory_p,
@@ -52,7 +55,7 @@
 	tree_sortkey like (select tree_sortkey from site_nodes where node_id = coalesce(:root_id, site_node__node_id('/', null))) || '%' and
 	(parent_id is null or parent_id in ([join $expand ", "]))) site_map
  on site_map.object_id = p.package_id
- order by site_map.tree_sortkey
+ order by url
 
       </querytext>
 </fullquery>
@@ -81,6 +84,7 @@
   and package_type = 'apm_service'
   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')
+  order by instance_name
 
       </querytext>
 </fullquery>