No activities found
" 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.88 -r1.89 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 23 Mar 2007 11:36:06 -0000 1.88 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 11 Apr 2007 12:36:29 -0000 1.89 @@ -296,10 +296,10 @@ # Page proc save_tags {-package_id:required -item_id:required -user_id:required tags} { - db_dml delete_tags \ + db_dml [my qn delete_tags] \ "delete from xowiki_tags where item_id = $item_id and user_id = $user_id" foreach tag $tags { - db_dml insert_tag \ + db_dml [my qn insert_tag] \ "insert into xowiki_tags (item_id,package_id, user_id, tag, time) \ values ($item_id, $package_id, $user_id, :tag, current_timestamp)" } @@ -308,18 +308,26 @@ if {[info exists item_id]} { if {[info exists user_id]} { # tags for item and user - set tags [db_list get_tags "SELECT distinct tag from xowiki_tags where user_id=$user_id and item_id=$item_id and package_id=$package_id"] + set tags [db_list [my qn get_tags] \ + "SELECT distinct tag from xowiki_tags \ + where user_id=$user_id and item_id=$item_id and package_id=$package_id"] } else { # all tags for this item - set tags [db_list get_tags "SELECT distinct tag from xowiki_tags where item_id=$item_id and package_id=$package_id"] + set tags [db_list [my qn get_tags] \ + "SELECT distinct tag from xowiki_tags \ + where item_id=$item_id and package_id=$package_id"] } } else { if {[info exists user_id]} { # all tags for this user - set tags [db_list get_tags "SELECT distinct tag from xowiki_tags where user_id=$user_id and package_id=$package_id"] + set tags [db_list [my qn get_tags] \ + "SELECT distinct tag from xowiki_tags \ + where user_id=$user_id and package_id=$package_id"] } else { # all tags for the package - set tags [db_list get_tags "SELECT distinct tag from xowiki_tags where package_id=$package_id"] + set tags [db_list [my qn get_tags] \ + "SELECT distinct tag from xowiki_tags \ + where package_id=$package_id"] } } join $tags " " @@ -599,7 +607,7 @@ set description [ad_html_text_convert -from text/html -to text/plain -- $content] } if {$description eq "" && $revision_id > 0} { - set description [db_string get_description_from_syndication \ + set description [db_string [my qn get_description_from_syndication] \ "select body from syndication where object_id = $revision_id" \ -default ""] } @@ -633,11 +641,11 @@ } Page instproc update_references {page_id references} { - db_dml delete_references \ + db_dml [my qn delete_references] \ "delete from xowiki_references where page = $page_id" foreach ref $references { foreach {r link_type} $ref break - db_dml insert_reference \ + db_dml [my qn insert_reference] \ "insert into xowiki_references (reference, link_type, page) \ values ($r,:link_type,$page_id)" } @@ -674,11 +682,11 @@ if {![info exists user_id]} {set user_id [ad_conn user_id]} if {$user_id > 0} { # only record information for authenticated users - db_dml update_last_visisted \ + db_dml [my qn update_last_visisted] \ "update xowiki_last_visited set time = current_timestamp, count = count + 1 \ where page_id = $item_id and user_id = $user_id" if {[db_resultrows] < 1} { - db_dml insert_last_visisted \ + db_dml [my qn insert_last_visisted] \ "insert into xowiki_last_visited (page_id, package_id, user_id, count, time) \ values ($item_id, $package_id, $user_id, 1, current_timestamp)" } @@ -733,7 +741,7 @@ if {![my exists full_file_name]} { if {[my exists item_id]} { my instvar text mime_type package_id item_id revision_id - set storage_area_key [db_string get_storage_key \ + set storage_area_key [db_string [my qn get_storage_key] \ "select storage_area_key from cr_items where item_id=$item_id"] my set full_file_name [cr_fs_path $storage_area_key]/$text #my log "--F setting FILE=[my set full_file_name]" Index: openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl,v diff -u -N -r1.17 -r1.18 --- openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl 4 Mar 2007 21:32:40 -0000 1.17 +++ openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl 11 Apr 2007 12:36:29 -0000 1.18 @@ -18,6 +18,8 @@ set page [::xowiki::Package instantiate_page_from_id -revision_id $revision_id -user_id 0] $page volatile + #ns_log notice "--sc package=[[$page package_id] serialize]" + if {[$page set publish_status] eq "production"} { # no data source for for pages under construction ns_log notice "--sc page under construction, no datasource" @@ -27,7 +29,7 @@ } $page absolute_links 1 - ns_log notice "--sc setting absolute links for page = $page [$page set name]" + #ns_log notice "--sc setting absolute links for page = $page [$page set name]" set html [$page render] set text [ad_html_text_convert -from text/html -to text/plain -- $html] 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 -N -r1.45 -r1.46 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 21 Mar 2007 10:49:46 -0000 1.45 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 11 Apr 2007 12:36:29 -0000 1.46 @@ -257,6 +257,7 @@ 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] \ @@ -269,6 +270,7 @@ } else { ::xowiki::f1 generate } +my log "--X after generate" ::xowiki::f1 instvar edit_form_page_title context formTemplate if {[info exists item_id]} { @@ -278,7 +280,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 \ @@ -313,7 +315,7 @@ Page instproc make-live-revision {} { my instvar revision_id item_id package_id my log "--M set_live_revision($revision_id)" - db_exec_plsql make_live {select content_item__set_live_revision(:revision_id)} + ::xo::db::CONTENT_ITEM SET_LIVE_REVISION 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" \ @@ -323,21 +325,21 @@ Page instproc delete-revision {} { my instvar revision_id package_id item_id - db_1row get_revision "select latest_revision,live_revision from cr_items where item_id = $item_id" + 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 - db_exec_plsql delete_revision {select content_revision__del(:revision_id)} + ::xo::db::CONTENT_REVISION DEL {revision_id} set redirect [my query_parameter "return_url" \ [export_vars -base [$package_id url] {{m revisions}}]] if {$live_revision == $revision_id} { # latest revision might have changed by delete_revision, so we have to fetch here - db_1row get_revision "select latest_revision from cr_items where item_id = $item_id" + db_1row [my qn get_revision] "select latest_revision from cr_items where item_id = $item_id" if {$latest_revision eq ""} { # we are out of luck, this was the final revision, delete the item my instvar package_id name $package_id delete -name $name -item_id $item_id } else { - db_0or1row make_live "select content_item__set_live_revision($latest_revision)" + ::xo::db::CONTENT_ITEM SET_LIVE_REVISION {{revision_id $latest_revision}} } } if {$latest_revision ne ""} { @@ -368,7 +370,7 @@ set href [$package_id pretty_link $weblog_page]?summary=1 set entries [list] - db_foreach get_popular_tags \ + db_foreach [my qn get_popular_tags] \ "select count(*) as nr,tag from xowiki_tags \ where item_id=$item_id group by tag order by nr limit $limit" { lappend entries "$tag ($nr)" 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 -N -r1.29 -r1.30 --- openacs-4/packages/xowiki/www/oacs-view.adp 25 Mar 2007 19:31:32 -0000 1.29 +++ openacs-4/packages/xowiki/www/oacs-view.adp 11 Apr 2007 12:36:29 -0000 1.30 @@ -1,4 +1,4 @@ - +