Index: openacs-4/packages/acs-subsite/www/admin/rel-types/new-2-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/new-2-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/rel-types/new-2-postgresql.xql	19 Aug 2001 16:32:15 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/new-2-postgresql.xql	9 Sep 2001 15:36:44 -0000	1.4
@@ -3,19 +3,34 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="select_object_types_2">      
+<fullquery name="select_object_types_one">      
       <querytext>
 
-    select lpad('&nbsp;', (tree_level(tree_sortkey) - 1) * 4) || t.pretty_name, 
-           t.object_type as rel_type
-      from acs_object_types t
-     where tree_sortkey like (select tree_sortkey || '%' from acs_object_types
-				where object_type = :max_object_type_one)
+    select repeat('&nbsp;', ((tree_level(t2.tree_sortkey) - tree_level(t1.tree_sortkey)) * 4)) || t2.pretty_name, 
+           t2.object_type as rel_type
+      from acs_object_types t1,
+	   acs_object_types t2
+     where t2.tree_sortkey like (t1.tree_sortkey || '%')
+       and t1.object_type = :max_object_type_one
 
       </querytext>
 </fullquery>
 
  
+<fullquery name="select_object_types_two">      
+      <querytext>
+
+    select repeat('&nbsp;', ((tree_level(t2.tree_sortkey) - tree_level(t1.tree_sortkey)) * 4)) || t2.pretty_name, 
+           t2.object_type as rel_type
+      from acs_object_types t1,
+	   acs_object_types t2
+     where t2.tree_sortkey like (t1.tree_sortkey || '%')
+       and t1.object_type = :max_object_type_two
+
+      </querytext>
+</fullquery>
+
+ 
 <fullquery name="pretty_name_unique">      
       <querytext>
       
@@ -27,10 +42,10 @@
 </fullquery>
 
  
-<fullquery name="pretty_name_unique">      
+<fullquery name="pretty_plural_unique">      
       <querytext>
       
-	    select case when exists (select 1 from acs_object_types t where t.pretty_name = :pretty_name)
+	    select case when exists (select 1 from acs_object_types t where t.pretty_plural = :pretty_plural)
                     then 1 else 0 end