Index: openacs-4/packages/xowiki/www/portlets/most-popular.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/most-popular.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/xowiki/www/portlets/most-popular.tcl 19 Jun 2006 00:40:04 -0000 1.4 +++ openacs-4/packages/xowiki/www/portlets/most-popular.tcl 17 Aug 2006 01:44:26 -0000 1.5 @@ -10,37 +10,38 @@ ::xowiki::Page proc __render_html { -folder_id + -package_id -max_entries -} { - set package_id [$folder_id set package_id] +} { TableWidget t1 -volatile \ -columns { - AnchorField title -label [_ xowiki.page_title] - Field count -label Count -html { align right } + AnchorField title -label [_ xowiki.page_title] + Field count -label Count -html { align right } } db_foreach get_pages \ "select sum(x.count), 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 \ - and x.package_id = $package_id group by x.page_id, r.title, i.name \ - order by sum desc limit $max_entries " \ + 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 \ + and x.package_id = $package_id group by x.page_id, r.title, i.name \ + order by sum desc limit $max_entries " \ { if {$title eq ""} {set title $name} t1 add \ - -title $title \ - -title.href [::xowiki::Page pretty_link $name] \ - -count $sum + -title $title \ + -title.href [::$package_id pretty_link $name] \ + -count $sum } return [t1 asHTML] } set content [::xowiki::Page __render_html \ - -folder_id [$__including_page set parent_id] \ - -max_entries [expr {[info exists max_entries] ? $max_entries : 10}] \ - ] + -folder_id [$__including_page set parent_id] \ + -package_id [$__including_page set package_id] \ + -max_entries [expr {[info exists max_entries] ? $max_entries : 10}] \ + ] if {![info exists name]} {set name "Most Popular Pages"} set link ""