Index: openacs-4/packages/acs-subsite/tcl/package-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/package-procs-oracle.xql,v diff -u -r1.8 -r1.9 --- openacs-4/packages/acs-subsite/tcl/package-procs-oracle.xql 15 Jan 2004 02:42:33 -0000 1.8 +++ openacs-4/packages/acs-subsite/tcl/package-procs-oracle.xql 17 Mar 2004 00:22:58 -0000 1.9 @@ -21,7 +21,7 @@ select upper(nvl(attr.table_name,t.table_name)) as attr_table_name, - upper(nvl(attr.column_name, attr.attribute_name)) as attr_column_name, + nvl(attr.column_name, attr.attribute_name) as attr_column_name, attr.ancestor_type, attr.min_n_values, attr.default_value from acs_object_type_attributes attr, (select t.object_type, t.table_name, level as type_level Index: openacs-4/packages/acs-subsite/tcl/package-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/package-procs-postgresql.xql,v diff -u -r1.12 -r1.13 --- openacs-4/packages/acs-subsite/tcl/package-procs-postgresql.xql 15 Jan 2004 02:42:33 -0000 1.12 +++ openacs-4/packages/acs-subsite/tcl/package-procs-postgresql.xql 17 Mar 2004 00:22:58 -0000 1.13 @@ -21,7 +21,7 @@ select upper(coalesce(attr.table_name,t.table_name)) as attr_table_name, - upper(coalesce(attr.column_name, attr.attribute_name)) as attr_column_name, + coalesce(attr.column_name, attr.attribute_name) as attr_column_name, attr.ancestor_type, attr.min_n_values, attr.default_value from acs_object_type_attributes attr, (select t2.object_type, t2.table_name, (tree_level(t1.tree_sortkey) - tree_level(t2.tree_sortkey)) + 1 as type_level Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v diff -u -r1.22 -r1.23 --- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 30 Jan 2004 15:19:05 -0000 1.22 +++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 17 Mar 2004 00:22:58 -0000 1.23 @@ -555,7 +555,8 @@ # See if the redirect-url to a package inside this subsite for { set i 0 } { $i < [llength $child_urls] } { incr i } { array set child_node [site_node::get_from_url -exact -url [lindex $child_urls $i]] - if { [string equal $index_redirect_url "$child_node(name)/"] } { + if { [string equal $index_redirect_url $child_node(url)] || + [string equal ${index_redirect_url}/ $child_node(url)]} { lappend pageflow $child_node(name) [list \ label "Home" \ folder $child_node(name) \