Index: openacs-4/packages/xowiki/xowiki.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v diff -u -r1.49 -r1.50 --- openacs-4/packages/xowiki/xowiki.info 11 Apr 2007 12:36:28 -0000 1.49 +++ openacs-4/packages/xowiki/xowiki.info 16 Apr 2007 11:15:09 -0000 1.50 @@ -110,7 +110,7 @@ - + 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 -r1.12 -r1.13 --- openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 11 Apr 2007 12:36:28 -0000 1.12 +++ openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 16 Apr 2007 11:15:10 -0000 1.13 @@ -87,14 +87,27 @@ if {[apm_version_names_compare $from_version_name "0.21"] == -1 && [apm_version_names_compare $to_version_name "0.21"] > -1} { ns_log notice "-- upgrading to 0.21" - ::xo::db::CONTENT_TYPE CREATE_ATTRIBUTE { - {content_type ::xowiki::Page} {attribute_name page_title} {datatype text} - {pretty_name "Page Title"} {column_spec text} - } - ::xo::db::CONTENT_TYPE CREATE_ATTRIBUTE { - {content_type ::xowiki::Page} {attribute_name creator} {datatype text} - {pretty_name "Creator"} {column_spec text} - } + ::xo::db::content_type create_attribute \ + -content_type ::xowiki::Page \ + -attribute_name page_title \ + -datatype text \ + -pretty_name "Page Title" \ + -column_spec text + ::xo::db::content_type create_attribute \ + -content_type ::xowiki::Page \ + -attribute_name creator \ + -datatype text \ + -pretty_name "Creator" \ + -column_spec text + +# ::xo::db::CONTENT_TYPE CREATE_ATTRIBUTE { +# {content_type ::xowiki::Page} {attribute_name page_title} {datatype text} +# {pretty_name "Page Title"} {column_spec text} +# } +# ::xo::db::CONTENT_TYPE CREATE_ATTRIBUTE { +# {content_type ::xowiki::Page} {attribute_name creator} {datatype text} +# {pretty_name "Creator"} {column_spec text} +# } ::xowiki::update_views } @@ -209,10 +222,15 @@ ::xowiki::add_ltree_order_column # get rid of obsolete column catch { - ::xo::db::CONTENT_TYPE DELETE_ATTRIBUTE { - {content_type ::xowiki::Page} {attribute_name page_title} - {drop_column t} - }} +# ::xo::db::CONTENT_TYPE DELETE_ATTRIBUTE { +# {content_type ::xowiki::Page} {attribute_name page_title} +# {drop_column t} +# } + ::xo::db::content_type delete_attribute \ + -content_type ::xowiki::Page \ + -attribute_name page_title \ + -drop_column t + } # drop old non-conformant indices foreach index { xowiki_ref_index xowiki_last_visited_index_unique xowiki_last_visited_index @@ -288,10 +306,17 @@ } { if {[::xo::db::has_ltree]} { # catch sql statement to allow multiple runs - catch {::xo::db::CONTENT_TYPE CREATE_ATTRIBUTE { - {content_type ::xowiki::Page} {attribute_name page_order} {datatype text} - {pretty_name Order} {column_spec ltree} - }} +# catch {::xo::db::CONTENT_TYPE CREATE_ATTRIBUTE { +# {content_type ::xowiki::Page} {attribute_name page_order} {datatype text} +# {pretty_name Order} {column_spec ltree} +# }} + catch {::xo::db::content_type create_attribute \ + -content_type ::xowiki::Page \ + -attribute_name page_order \ + -datatype text \ + -pretty_name Order \ + -column_spec ltree} + ::xo::db::require index -table xowiki_page -col page_order -using gist set result 1 } else { Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v diff -u -r1.41 -r1.42 --- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 11 Apr 2007 12:36:29 -0000 1.41 +++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 16 Apr 2007 11:15:10 -0000 1.42 @@ -905,8 +905,8 @@ set pretty_time [util::age_pretty -timestamp_ansi $time \ -sysdate_ansi [clock_to_ansi [clock seconds]] \ -mode_3_fmt "%d %b %Y, at %X"] - set name [::xo::get_user_name $user_id] + append output "$name$pretty_time\n" } if {$output ne ""} {set output "$output
\n"} Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v diff -u -r1.46 -r1.47 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 11 Apr 2007 12:36:29 -0000 1.46 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 16 Apr 2007 11:15:10 -0000 1.47 @@ -257,7 +257,6 @@ variable ::template::parse_level lappend parse_level [info level] set action_vars [expr {$new ? "{edit-new 1} object_type return_url" : "{m edit} return_url"}] -my log "--X get_form" [$object_type getFormClass -data [self]] create ::xowiki::f1 -volatile \ -action [export_vars -base [$package_id url] $action_vars] \ -data [self] \ @@ -270,7 +269,7 @@ } else { ::xowiki::f1 generate } -my log "--X after generate" + ::xowiki::f1 instvar edit_form_page_title context formTemplate if {[info exists item_id]} { @@ -280,7 +279,7 @@ if {[info exists last_page_id]} { set back_link [$package_id url] } -my log "--X call returnb_page" + set index_link [$package_id make_link -privilege public -link "" $package_id {} {}] set html [$package_id return_page -adp /packages/xowiki/www/edit \ -form f1 \ @@ -314,8 +313,9 @@ Page instproc make-live-revision {} { my instvar revision_id item_id package_id - my log "--M set_live_revision($revision_id)" - ::xo::db::CONTENT_ITEM SET_LIVE_REVISION revision_id + #my log "--M set_live_revision($revision_id)" + #::xo::db::CONTENT_ITEM SET_LIVE_REVISION revision_id + ::xo::db::content_item set_live_revision -revision_id $revision_id set page_id [my query_parameter "page_id"] ns_cache flush xotcl_object_cache ::$item_id ::$package_id returnredirect [my query_parameter "return_url" \ @@ -328,7 +328,8 @@ db_1row [my qn get_revision] "select latest_revision,live_revision from cr_items where item_id = $item_id" ns_cache flush xotcl_object_cache ::$item_id ns_cache flush xotcl_object_cache ::$revision_id - ::xo::db::CONTENT_REVISION DEL {revision_id} + #::xo::db::CONTENT_REVISION DEL {revision_id} + ::xo::db::content_revision del -revision_id $revision_id set redirect [my query_parameter "return_url" \ [export_vars -base [$package_id url] {{m revisions}}]] if {$live_revision == $revision_id} { @@ -339,7 +340,8 @@ my instvar package_id name $package_id delete -name $name -item_id $item_id } else { - ::xo::db::CONTENT_ITEM SET_LIVE_REVISION {{revision_id $latest_revision}} + #::xo::db::CONTENT_ITEM SET_LIVE_REVISION {{revision_id $latest_revision}} + ::xo::db::content_item set_live_revision -revision_id $latest_revision } } if {$latest_revision ne ""} { Index: openacs-4/packages/xowiki/www/oacs-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view.adp,v diff -u -r1.30 -r1.31 --- openacs-4/packages/xowiki/www/oacs-view.adp 11 Apr 2007 12:36:29 -0000 1.30 +++ openacs-4/packages/xowiki/www/oacs-view.adp 16 Apr 2007 11:15:10 -0000 1.31 @@ -1,4 +1,4 @@ - + @title;noquote@ @context;noquote@ Index: openacs-4/packages/xowiki/www/oacs-view2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view2.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/xowiki/www/oacs-view2.adp 11 Apr 2007 12:36:29 -0000 1.9 +++ openacs-4/packages/xowiki/www/oacs-view2.adp 16 Apr 2007 11:15:10 -0000 1.10 @@ -1,4 +1,4 @@ - + @title;noquote@ @context;noquote@ Index: openacs-4/packages/xowiki/www/oacs-view3.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view3.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/xowiki/www/oacs-view3.adp 11 Apr 2007 12:36:29 -0000 1.4 +++ openacs-4/packages/xowiki/www/oacs-view3.adp 16 Apr 2007 11:15:10 -0000 1.5 @@ -1,4 +1,4 @@ - + @title;noquote@ @context;noquote@ Index: openacs-4/packages/xowiki/www/view-default.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-default.adp,v diff -u -r1.26 -r1.27 --- openacs-4/packages/xowiki/www/view-default.adp 11 Apr 2007 12:36:29 -0000 1.26 +++ openacs-4/packages/xowiki/www/view-default.adp 16 Apr 2007 11:15:10 -0000 1.27 @@ -1,4 +1,4 @@ - + @title;noquote@ @context;noquote@ Index: openacs-4/packages/xowiki/www/view-links.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-links.adp,v diff -u -r1.16 -r1.17 --- openacs-4/packages/xowiki/www/view-links.adp 11 Apr 2007 12:36:29 -0000 1.16 +++ openacs-4/packages/xowiki/www/view-links.adp 16 Apr 2007 11:15:10 -0000 1.17 @@ -1,4 +1,4 @@ - +
Index: openacs-4/packages/xowiki/www/view-plain.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-plain.adp,v diff -u -r1.12 -r1.13 --- openacs-4/packages/xowiki/www/view-plain.adp 11 Apr 2007 12:36:29 -0000 1.12 +++ openacs-4/packages/xowiki/www/view-plain.adp 16 Apr 2007 11:15:10 -0000 1.13 @@ -1,4 +1,4 @@ - +
Index: openacs-4/packages/xowiki/www/admin/set-publish-state.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/set-publish-state.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/xowiki/www/admin/set-publish-state.tcl 11 Apr 2007 12:36:29 -0000 1.4 +++ openacs-4/packages/xowiki/www/admin/set-publish-state.tcl 16 Apr 2007 11:15:10 -0000 1.5 @@ -19,7 +19,10 @@ ns_cache flush xotcl_object_cache ::$item_id ns_cache flush xotcl_object_cache ::$revision_id -::xo::db::CONTENT_ITEM MAKE_LIVE {revision_id state} +#::xo::db::CONTENT_ITEM MAKE_LIVE {revision_id state} +::xo::db::content_item make_live \ + -revision_id $revision_id \ + -state $state if {$state ne "production"} { ::xowiki::notification::do_notifications -revision_id $revision_id Index: openacs-4/packages/xowiki/www/xinha/file-selector.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/file-selector.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/xowiki/www/xinha/file-selector.tcl 11 Apr 2007 12:36:29 -0000 1.6 +++ openacs-4/packages/xowiki/www/xinha/file-selector.tcl 16 Apr 2007 11:15:10 -0000 1.7 @@ -157,7 +157,10 @@ set folder_name [lang::util::localize [fs::get_object_name -object_id $folder_id]] set content_size_total 0 -set folder_path [::xo::db::CONTENT_ITEM GET_PATH {folder_id root_folder_id}] +#set folder_path [::xo::db::CONTENT_ITEM GET_PATH {folder_id root_folder_id}] +set folder_path [::xo::db::content_item get_path \ + -folder_id $folder_id \ + -root_folder_id $root_folder_id] # -pass_to_urls {c}