Index: openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 29 Dec 2006 11:01:36 -0000 1.6 +++ openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 29 Dec 2006 11:08:19 -0000 1.7 @@ -262,7 +262,7 @@ ad_proc add_ltree_order_column {} { add ltree order column, if ltree is configured } { - if {[::xo::has_ltree]} { + if {[::xo::db::has_ltree]} { set object_type ::xowiki::Page set attribute_name page_order set datatype text Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v diff -u -N -r1.23 -r1.24 --- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 29 Dec 2006 11:01:36 -0000 1.23 +++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 29 Dec 2006 11:08:19 -0000 1.24 @@ -54,7 +54,7 @@ my instvar data set __fields "" set field_list [my field_list] - if {[::xo::has_ltree]} {set field_list [linsert $field_list 2 page_order]} + if {[::xo::db::has_ltree]} {set field_list [linsert $field_list 2 page_order]} foreach __field $field_list { set __spec [my set f.$__field] if {[string first "richtext" [lindex $__spec 0]] > -1} { Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v diff -u -N -r1.63 -r1.64 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 29 Dec 2006 11:01:36 -0000 1.63 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 29 Dec 2006 11:08:19 -0000 1.64 @@ -16,7 +16,7 @@ -table_name "xowiki_page" -id_column "page_id" \ -mime_type text/html \ -cr_attributes { - if {[::xo::has_ltree]} { + if {[::xo::db::has_ltree]} { ::Generic::Attribute new -attribute_name page_order -datatype text \ -pretty_name "Order" -sqltype ltree } @@ -92,7 +92,7 @@ ::xo::db::require index -table xowiki_tags -col tag,package_id - if {[::xo::has_ltree]} { + if {[::xo::db::has_ltree]} { ::xo::db::require index -table xowiki_page -col page_order -using gist } Index: openacs-4/packages/xowiki/www/admin/list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/xowiki/www/admin/list.tcl 29 Dec 2006 11:01:36 -0000 1.7 +++ openacs-4/packages/xowiki/www/admin/list.tcl 29 Dec 2006 11:08:19 -0000 1.8 @@ -64,7 +64,7 @@ -height 8 -border 0 -title "Toggle Publish Status" \ -alt "publish status" -label [_ xowiki.publish_status] -html {style "padding: 2px;"} } - if {[::xo::has_ltree]} { + if {[::xo::db::has_ltree]} { AnchorField page_order -label [_ xowiki.order] -orderby page_order } AnchorField name -label [_ xowiki.name] -orderby name @@ -121,7 +121,7 @@ [export_vars -base [$package_id package_url]admin/set-publish-state \ {state revision_id return_url}] } - if {[::xo::has_ltree]} { + if {[::xo::db::has_ltree]} { [t1 last_child] set page_order $page_order } }