Index: openacs-4/packages/acs-subsite/www/admin/rel-types/new-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/new-2-oracle.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/rel-types/new-2-oracle.xql 19 Aug 2001 16:32:14 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/new-2-oracle.xql 9 Sep 2001 15:36:44 -0000 1.3 @@ -3,7 +3,7 @@ oracle8.1.6 - + select replace(lpad(' ', (level - 1) * 4), ' ', ' ') || t.pretty_name, @@ -16,14 +16,14 @@ - + select replace(lpad(' ', (level - 1) * 4), ' ', ' ') || t.pretty_name, t.object_type as rel_type from acs_object_types t connect by prior t.object_type = t.supertype - start with t.object_type=:max_object_type_one + start with t.object_type=:max_object_type_two @@ -40,10 +40,10 @@ - + - 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 from dual 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 @@ postgresql7.1 - + - select lpad(' ', (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(' ', ((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 + + + + select repeat(' ', ((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 + + + + + @@ -27,10 +42,10 @@ - + - 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 Index: openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl 19 Aug 2001 16:32:15 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl 9 Sep 2001 15:36:44 -0000 1.3 @@ -74,15 +74,15 @@ and r.rel_type = t.object_type } -set object_types_one_list [db_list_of_lists select_object_types_2 { +set object_types_one_list [db_list_of_lists select_object_types_one { select replace(lpad(' ', (level - 1) * 4), ' ', ' ') || t.pretty_name, t.object_type as rel_type from acs_object_types t connect by prior t.object_type = t.supertype start with t.object_type=:max_object_type_one }] -set object_types_two_list [db_list_of_lists select_object_types { +set object_types_two_list [db_list_of_lists select_object_types_two { select replace(lpad(' ', (level - 1) * 4), ' ', ' ') || t.pretty_name, t.object_type as rel_type from acs_object_types t @@ -175,7 +175,7 @@ append exception_text "
  • The specified pretty name, $pretty_name, already exists. Please enter another
  • " } - if { [db_string pretty_name_unique { + if { [db_string pretty_plural_unique { select case when exists (select 1 from acs_object_types t where t.pretty_plural = :pretty_plural) then 1 else 0 end from dual