Index: openacs-4/packages/xowiki/tcl/weblog-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/weblog-procs.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/xowiki/tcl/weblog-procs.tcl 15 Jan 2007 11:41:59 -0000 1.6 +++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl 19 Feb 2007 10:01:28 -0000 1.7 @@ -12,14 +12,17 @@ ptag category_id filter_msg + {name_filter ""} + {entry_label "Postings"} {exclude_item_ids 0} {summary false} {entry_renderer ::xowiki::Weblog::Entry} } ::xowiki::Weblog instproc init {} { my instvar filter_msg package_id nr_items next_page_link prev_page_link - my instvar date category_id tag ptag page_number page_size summary items + my instvar date category_id tag ptag page_number page_size summary items + my instvar name_filter entry_label my log "--W starting" set folder_id [::$package_id set folder_id] @@ -63,6 +66,9 @@ append extra_where_clause "and tags.item_id = ci.item_id and tags.tag = :ptag " set query_parm "&ptag=[ad_urlencode $ptag]" } + if {$name_filter ne ""} { + append extra_where_clause "and ci.name ~ E'$name_filter' " + } # create an item container, which delegates rendering to its chidlren set items [::xo::OrderedComposite new -proc render {} { @@ -116,6 +122,8 @@ } } $p set pretty_date $pretty_date + $p set publish_date $publish_date + my log "--W setting $p set publish_date $publish_date" #$p proc destroy {} {my log "--Render temporal object destroyed"; next} #ns_log notice "--W Render object $p DONE $page_id $name $title " @@ -131,9 +139,9 @@ set range [expr {$nr > 1 ? "$from - $to" : $from}] if {$filter_msg ne ""} { - append filter_msg ", $range of $nr_items Postings (all, $flink)" + append filter_msg ", $range of $nr_items $entry_label (all, $flink)" } else { - append filter_msg "Showing $range of $nr_items Postings ($flink)" + append filter_msg "Showing $range of $nr_items $entry_label ($flink)" } set next_p [expr {$nr_items > $page_number*$page_size}]