Index: openacs-4/packages/news-aggregator/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/index.tcl,v diff -u -r1.9.2.9 -r1.9.2.10 --- openacs-4/packages/news-aggregator/www/index.tcl 3 Feb 2006 23:54:57 -0000 1.9.2.9 +++ openacs-4/packages/news-aggregator/www/index.tcl 16 Feb 2006 15:59:59 -0000 1.9.2.10 @@ -204,33 +204,23 @@ } if { [exists_and_not_null content_encoded] } { -# if { [exists_and_not_null item_title] } { -# set content "$item_title. $content_encoded" -# } else { - set content $content_encoded -# } + set content $content_encoded } else { set text_only [util_remove_html_tags $item_description] - -# if { [exists_and_not_null item_title] } { -# set content "$item_title. $item_author -# $item_description" -# } else { set content $item_description -# } } if { $item_permalink_p == "t" } { set item_guid_link $item_original_guid } else { set item_guid_link $item_link } + set item_title [string_truncate -len 80 -- $item_title] - #set diff [news_aggregator::last_scanned -diff [expr [expr [clock seconds] - [clock scan $last_scanned]] / 60]] set source_url [export_vars -base source {source_id}] set technorati_url "http://www.technorati.com/cosmos/links.html?url=$link&sub=Get+Link+Cosmos" - set pub_timestamp [clock scan [lc_time_utc_to_local $item_pub_date]] + set pub_timestamp [clock scan $pub_date_time] set pub_datestamp [clock scan [clock format $pub_timestamp -format "%Y-%m-%d 00:00:00"]] set inner_sort_col "${pub_datestamp},${source_id}" set chunk_updated [news_aggregator::chunk_updated [expr [expr [clock seconds] - $pub_datestamp] / 60]] @@ -260,8 +250,6 @@ } } -template::multirow sort items -decreasing pub_datestamp title pub_timestamp - if { $enable_purge_p && [exists_and_not_null top] && [exists_and_not_null bottom] && $top >= $bottom && $public_p == "f" &&