Index: openacs-4/packages/xowiki/xowiki.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v diff -u -N -r1.48 -r1.49 --- openacs-4/packages/xowiki/xowiki.info 25 Mar 2007 19:31:32 -0000 1.48 +++ openacs-4/packages/xowiki/xowiki.info 11 Apr 2007 12:36:28 -0000 1.49 @@ -8,11 +8,11 @@ f xowiki - + Gustaf Neumann A more generic xotcl-based wikis example with object types and subtypes based on the content repository (with category support) - 2007-03-25 + 2007-04-11 <pre> XoWiki is a wiki implementation for OpenACS in XOTcl. Instead of trying to implement the full set of wiki markup commands of systems @@ -99,16 +99,18 @@ 0.49: adp-generator, make tags/categories/social software buttons per item in a weblog, oacs-view2 and oacs-view3 0.50: timeline support, new includelets activity-graph, collab-graph, timeline, and user-timeline + +0.51: minimal zen support, using new oo interface form xotcl-core, more silent on db-operations in error log </pre> BSD-Style 0 - + - + Index: openacs-4/packages/xowiki/tcl/package-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v diff -u -N -r1.51 -r1.52 --- openacs-4/packages/xowiki/tcl/package-procs.tcl 25 Mar 2007 19:31:32 -0000 1.51 +++ openacs-4/packages/xowiki/tcl/package-procs.tcl 11 Apr 2007 12:36:28 -0000 1.52 @@ -29,7 +29,8 @@ $page folder_id [$page set parent_id] if {[apm_version_names_compare [ad_acs_version] 5.2] <= -1} { - set package_id [db_string get_pid "select package_id from cr_folders where folder_id = [$page $folder_id]"] + set package_id [db_string [my qn get_pid] \ + "select package_id from cr_folders where folder_id = [$page $folder_id]"] $page package_id $package_id } else { set package_id [$page set package_id] @@ -45,10 +46,10 @@ @return list of package_ids of xowiki instances } { if {$include_unmounted} { - return [db_list get_xowiki_packages {select package_id \ + return [db_list [my qn get_xowiki_packages] {select package_id \ from apm_packages where package_key = 'xowiki'}] } else { - return [db_list get_mounted_packages {select package_id \ + return [db_list [my qn get_mounted_packages] {select package_id \ from apm_packages p, site_nodes s \ where package_key = 'xowiki' and s.object_id = p.package_id}] } @@ -135,7 +136,6 @@ set host [expr {$absolute ? ($siteurl ne "" ? $siteurl : [ad_url]) : ""}] if {$anchor ne ""} {set anchor \#$anchor} #my log "--LINK $lang == $default_lang [expr {$lang ne $default_lang}] $name" - set package_prefix [my get_parameter package_prefix [my package_url]] if {$package_prefix eq "/" && [string length $lang]>2} { # don't compact the the path for images etc. to avoid conflicts with e.g. //../image/* @@ -505,7 +505,7 @@ reindex all items of this package } { my instvar folder_id - set pages [db_list get_pages "select page_id from xowiki_page, cr_revisions r, cr_items ci \ + set pages [db_list [my qn get_pages] "select page_id from xowiki_page, cr_revisions r, cr_items ci \ where page_id = r.revision_id and ci.item_id = r.item_id and ci.parent_id = $folder_id \ and ci.live_revision = page_id"] #my log "--reindex returns <$pages>" @@ -665,7 +665,7 @@ set content { } - db_foreach get_pages \ + db_foreach [my qn get_pages] \ "select s.body, p.name, p.creator, p.title, p.page_id,\ p.object_type as content_type, p.last_modified, p.description \ from xowiki_pagex p, syndication s, cr_items ci \ @@ -712,7 +712,7 @@ } foreach package_id [::xowiki::Package instances] { - set last_modified [db_string get_newest_modification_date \ + set last_modified [db_string [my qn get_newest_modification_date] \ "select last_modified from acs_objects where package_id = $package_id \ order by last_modified desc limit 1"] 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.11 -r1.12 --- openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 17 Feb 2007 23:01:36 -0000 1.11 +++ openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 11 Apr 2007 12:36:28 -0000 1.12 @@ -87,18 +87,15 @@ 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" - db_1row create_att { - select content_type__create_attribute( - '::xowiki::Page','page_title','text', - 'Page Title',null,null,null,'text' )} - db_1row create_att { - select content_type__create_attribute( - '::xowiki::Page','creator','text', - 'Creator',null,null,null,'text' )} - db_1row refresh "select content_type__refresh_view('::xowiki::PlainPage') from dual" - db_1row refresh "select content_type__refresh_view('::xowiki::PageTemplate') from dual" - db_1row refresh "select content_type__refresh_view('::xowiki::PageInstance') from dual" - db_1row refresh "select content_type__refresh_view('::xowiki::Object') from dual" + ::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 } if {[apm_version_names_compare $from_version_name "0.22"] == -1 && @@ -144,10 +141,11 @@ db_dml copy_page_title_into_title \ "update cr_revisions set title = p.page_title from xowiki_page p \ where page_title != '' and revision_id = p.page_id" - db_foreach delete_deprecated_types_from_ancient_versions \ - "select content_item__delete(i.item_id) from cr_items i \ + + db_list delete_deprecated_types_from_ancient_versions \ + [::xo::db::map "select content_item__delete(i.item_id) from cr_items i \ where content_type in ('CrWikiPage', 'CrWikiPlainPage', \ - 'PageInstance', 'PageTemplate','CrNote', 'CrSubNote')" {;} + 'PageInstance', 'PageTemplate','CrNote', 'CrSubNote')"] } if {[apm_version_names_compare $from_version_name "0.30"] == -1 && @@ -210,9 +208,11 @@ ns_log notice "-- upgrading to 0.42" ::xowiki::add_ltree_order_column # get rid of obsolete column - catch {db_1row delete_att { - select content_type__drop_attribute('::xowiki::Page','page_title', 't'::boolean)} - } + catch { + ::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 @@ -253,18 +253,30 @@ update all automatic views of xowiki } { - set updates [db_list_of_lists get_xowiki_types \ - "select object_type,\ - content_type__refresh_view(object_type) + set sql(oracle) "select object_type, content_type.refresh_view(object_type) \ + from acs_object_types \ + connect by supertype = prior object_type + start with object_type = '::xowiki::Page'" + + set sql(postgresql) "select object_type,content_type__refresh_view(object_type) from acs_object_types \ where object_type like '::xowiki::%' \ - order by tree_sortkey "] + order by tree_sortkey " + db_list get_xowiki_types $sql([db_driverkey ""]) + catch {db_dml drop_live_revision_view "drop view xowiki_page_live_revision"} + + if {[db_driverkey ""] eq "postgresql"} { + set sortkeys ", ci.tree_sortkey, ci.max_child_sortkey " + } else { + set sortkeys "" + } + ::xo::db::require view xowiki_page_live_revision \ "select p.*, cr.*,ci.parent_id, ci.name, ci.locale, ci.live_revision, \ ci.latest_revision, ci.publish_status, ci.content_type, ci.storage_type, \ - ci.storage_area_key, ci.tree_sortkey, ci.max_child_sortkey \ + ci.storage_area_key $sortkeys \ from xowiki_page p, cr_items ci, cr_revisions cr \ where p.page_id = ci.live_revision \ and p.page_id = cr.revision_id \ @@ -275,17 +287,12 @@ add ltree order column, if ltree is configured } { if {[::xo::db::has_ltree]} { - set object_type ::xowiki::Page - set attribute_name page_order - set datatype text - set pretty_name Order - set sqltype ltree # catch sql statement to allow multiple runs - catch {db_1row create_att {select content_type__create_attribute( - :object_type,:attribute_name,:datatype, - :pretty_name,null,null,null,:sqltype)}} - catch {db_dml create_index "create index xowiki_page_page_order_idx \ - on xowiki_page using gist (page_order)"} + 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 { set result 0 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.39 -r1.40 --- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 30 Mar 2007 12:47:38 -0000 1.39 +++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 11 Apr 2007 12:36:29 -0000 1.40 @@ -120,7 +120,7 @@ set q [$templateclass instance_select_query \ -folder_id $folder_id \ -select_attributes {name}] - db_foreach get_page_templates $q { + db_foreach [my qn get_page_templates] $q { lappend lpairs [list $name $item_id] } if_no_rows { lappend lpairs [list "(No Page Template available)" ""] 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 -N -r1.40 -r1.41 --- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 3 Apr 2007 19:17:17 -0000 1.40 +++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 11 Apr 2007 12:36:29 -0000 1.41 @@ -295,7 +295,7 @@ append sql $locale_clause if {$count} { - db_foreach get_counts \ + db_foreach [my qn get_counts] \ "select count(*) as nr,category_id from $sql group by category_id" { $category($category_id) set count $nr set s [expr {$summary ? "&summary=$summary" : ""}] @@ -304,7 +304,7 @@ } append content [$cattree(0) render -tree_style $tree_style] } else { - db_foreach get_pages \ + db_foreach [my qn get_pages] \ "select ci.item_id, ci.name, ci.content_type, r.title, category_id from $sql" { if {$title eq ""} {set title $name} set itemobj [Object new] @@ -369,7 +369,7 @@ set tree_select_clause "" } - db_foreach get_pages \ + db_foreach [my qn get_pages] \ "select c.category_id, ci.name, r.title, \ to_char(r.publish_date,'YYYY-MM-DD HH24:MI:SS') as publish_date \ from category_object_map_tree c, cr_items ci, cr_revisions r, xowiki_page p \ @@ -423,7 +423,7 @@ AnchorField title -label [_ xowiki.page_title] } - db_foreach get_pages \ + db_foreach [my qn get_pages] \ "select i.name, r.title, \ to_char(r.publish_date,'YYYY-MM-DD HH24:MI:SS') as publish_date \ from cr_items i, cr_revisions r, xowiki_page p \ @@ -470,7 +470,7 @@ AnchorField title -label [_ xowiki.page_title] } - db_foreach get_pages \ + db_foreach [my qn get_pages] \ "select r.title,i.name, to_char(x.time,'YYYY-MM-DD HH24:MI:SS') as visited_date \ from xowiki_last_visited x, xowiki_page p, cr_items i, cr_revisions r \ where x.page_id = i.item_id and i.live_revision = p.page_id \ @@ -520,7 +520,7 @@ AnchorField title -label [_ xowiki.page_title] Field users -label Visitors -html { align right } } - db_foreach get_pages \ + db_foreach [my qn get_pages] \ "select count(x.user_id) as nr_different_users, x.page_id, r.title,i.name \ from xowiki_last_visited x, xowiki_page p, cr_items i, cr_revisions r \ where x.page_id = i.item_id and i.live_revision = p.page_id and r.revision_id = p.page_id \ @@ -542,7 +542,7 @@ Field count -label Visits -html { align right } Field users -label Visitors -html { align right } } - db_foreach get_pages \ + db_foreach [my qn get_pages] \ "select sum(x.count), count(x.user_id) as nr_different_users, x.page_id, r.title,i.name \ from xowiki_last_visited x, xowiki_page p, cr_items i, cr_revisions r \ where x.page_id = i.item_id and i.live_revision = p.page_id and r.revision_id = p.page_id \ @@ -600,7 +600,7 @@ if {![info exists page]} {set page [$package_id get_parameter weblog_page]} set base_url [$package_id pretty_link $page] - db_foreach get_counts $sql { + db_foreach [my qn get_counts] $sql { set s [expr {$summary ? "&summary=$summary" : ""}] set href $base_url?$tag_type=[ad_urlencode $tag]$s lappend entries "$tag ($nr)" @@ -812,7 +812,7 @@ set item_id [$__including_page item_id] set refs [list] - db_foreach get_references "SELECT page,ci.name,f.package_id \ + db_foreach [my qn get_references] "SELECT page,ci.name,f.package_id \ from xowiki_references,cr_items ci,cr_folders f \ where reference=$item_id and ci.item_id = page and ci.parent_id = f.folder_id" { ::xowiki::Package require $package_id @@ -889,13 +889,13 @@ set output "" if {$summary} { - set count [db_string presence_count_users "$select_count $where_clause"] + set count [db_string [my qn presence_count_users] "$select_count $where_clause"] } else { - set values [db_list_of_lists get_users "$select_users $where_clause $order_clause"] + set values [db_list_of_lists [my qn get_users] "$select_users $where_clause $order_clause"] set count [llength $values] if {$count == $max_users} { # we have to check, whether there were more users... - set count [db_string presence_count_users "$select_count $where_clause"] + set count [db_string [my qn presence_count_users] "$select_count $where_clause"] } foreach value $values { foreach {user_id time} $value break @@ -1365,7 +1365,7 @@ if {![info exists user_id]} {set user_id [::xo::cc user_id]} set folder_id [$package_id folder_id] - db_foreach get_collaborators { + db_foreach [my qn get_collaborators] { select count(revision_id), item_id, creation_user from cr_revisions r, acs_objects o where item_id in @@ -1448,9 +1448,9 @@ set folder_id [$package_id folder_id] # there must be a better way to handle temporaray tables safely.... - catch {db_dml drop_temp_table {drop table XOWIKI_TEMP_TABLE }} + catch {db_dml [my qn drop_temp_table] {drop table XOWIKI_TEMP_TABLE }} - db_dml get_n_most_revent_contributions { + db_dml [my qn get_n_most_revent_contributions] { create temporary table XOWIKI_TEMP_TABLE as select i.item_id, revision_id, creation_user from cr_revisions cr, cr_items i, acs_objects o @@ -1460,7 +1460,7 @@ } set total 0 - db_foreach get_activities { + db_foreach [my qn get_activities] { select count(revision_id),item_id, creation_user from XOWIKI_TEMP_TABLE where creation_user is not null @@ -1474,7 +1474,7 @@ set user($creation_user) "[::xo::get_user_name $creation_user] ([set $count_var])" } - db_dml drop_temp_table {drop table XOWIKI_TEMP_TABLE } + db_dml [my qn drop_temp_table] {drop table XOWIKI_TEMP_TABLE } if {[array size i] == 0} { append result "

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 @@ - + @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 -N -r1.8 -r1.9 --- openacs-4/packages/xowiki/www/oacs-view2.adp 25 Mar 2007 19:31:32 -0000 1.8 +++ openacs-4/packages/xowiki/www/oacs-view2.adp 11 Apr 2007 12:36:29 -0000 1.9 @@ -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 -N -r1.3 -r1.4 --- openacs-4/packages/xowiki/www/oacs-view3.adp 25 Mar 2007 19:31:32 -0000 1.3 +++ openacs-4/packages/xowiki/www/oacs-view3.adp 11 Apr 2007 12:36:29 -0000 1.4 @@ -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 -N -r1.25 -r1.26 --- openacs-4/packages/xowiki/www/view-default.adp 25 Mar 2007 19:31:32 -0000 1.25 +++ openacs-4/packages/xowiki/www/view-default.adp 11 Apr 2007 12:36:29 -0000 1.26 @@ -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 -N -r1.15 -r1.16 --- openacs-4/packages/xowiki/www/view-links.adp 25 Mar 2007 19:31:32 -0000 1.15 +++ openacs-4/packages/xowiki/www/view-links.adp 11 Apr 2007 12:36:29 -0000 1.16 @@ -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 -N -r1.11 -r1.12 --- openacs-4/packages/xowiki/www/view-plain.adp 25 Mar 2007 19:31:32 -0000 1.11 +++ openacs-4/packages/xowiki/www/view-plain.adp 11 Apr 2007 12:36:29 -0000 1.12 @@ -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 -N -r1.3 -r1.4 --- openacs-4/packages/xowiki/www/admin/set-publish-state.tcl 4 Mar 2007 21:49:11 -0000 1.3 +++ openacs-4/packages/xowiki/www/admin/set-publish-state.tcl 11 Apr 2007 12:36:29 -0000 1.4 @@ -19,7 +19,7 @@ ns_cache flush xotcl_object_cache ::$item_id ns_cache flush xotcl_object_cache ::$revision_id -db_0or1row make_live {select content_item__set_live_revision(:revision_id,:state)} +::xo::db::CONTENT_ITEM MAKE_LIVE {revision_id 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 -N -r1.5 -r1.6 --- openacs-4/packages/xowiki/www/xinha/file-selector.tcl 17 Aug 2006 01:44:27 -0000 1.5 +++ openacs-4/packages/xowiki/www/xinha/file-selector.tcl 11 Apr 2007 12:36:29 -0000 1.6 @@ -157,11 +157,8 @@ set folder_name [lang::util::localize [fs::get_object_name -object_id $folder_id]] set content_size_total 0 -set folder_path [db_exec_plsql get_folder_path { - select content_item__get_path(:folder_id, :root_folder_id) -}] +set folder_path [::xo::db::CONTENT_ITEM GET_PATH {folder_id root_folder_id}] - # -pass_to_urls {c} template::list::create \