Index: openacs-4/packages/news-aggregator/news-aggregator.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/news-aggregator.info,v diff -u -r1.13.2.4 -r1.13.2.5 --- openacs-4/packages/news-aggregator/news-aggregator.info 14 Jan 2006 23:27:58 -0000 1.13.2.4 +++ openacs-4/packages/news-aggregator/news-aggregator.info 28 Jan 2006 04:17:43 -0000 1.13.2.5 @@ -19,8 +19,8 @@ - + @@ -31,6 +31,7 @@ + Index: openacs-4/packages/news-aggregator/todo =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/Attic/todo,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/news-aggregator/todo 18 Jan 2006 15:25:16 -0000 1.1.2.3 +++ openacs-4/packages/news-aggregator/todo 28 Jan 2006 04:17:43 -0000 1.1.2.4 @@ -1,19 +1,21 @@ MS: some thoughts for improvements; should also mine bloglines, newsgator and yahoo (et. al) for more ideas -version 0.9.9 - - html for aggregator description - - parameterize the query limit for items (hard coded to 600) version 1 + - fix portlet + - parameterize the query limit for items (hard coded to 600) + - ok, this is actually handled on index page with parameter but we should only get what we want to display - code cleanup and complete tests - - update data model for 5.2 version 1.1 + - update data model for 5.2 + - richtext widget for aggregator description? - add to del.ici.us button? - edit subscription title version 1.2 - notifications (convert multiple rss feeds to email. cool?!?) + - rework index page query to convert time in DB (sort is by date, source, time) version 1.3 - search version 1.4+ - per subscription keywords - other display options? - - style items (both w and w/o description) entirely via css (per package param for location) \ No newline at end of file + - clean up styled items (both w and w/o description) entirely via css Index: openacs-4/packages/news-aggregator/sql/postgresql/upgrade/upgrade-0.9.7-0.9.8.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/sql/postgresql/upgrade/Attic/upgrade-0.9.7-0.9.8.sql,v diff -u -r1.1.2.4 -r1.1.2.5 --- openacs-4/packages/news-aggregator/sql/postgresql/upgrade/upgrade-0.9.7-0.9.8.sql 23 Jan 2006 15:39:59 -0000 1.1.2.4 +++ openacs-4/packages/news-aggregator/sql/postgresql/upgrade/upgrade-0.9.7-0.9.8.sql 28 Jan 2006 04:17:43 -0000 1.1.2.5 @@ -60,10 +60,8 @@ drop column owner_id; -- this was not used and is available in acs_objects beginnning with 5.2 in any case --- THIS IS DEADLY. DONT DO THIS. WRITE A PLSQL FUNCTION TO UPDATE THE PACKAGE_ID FIRST !!!! --- --- alter table na_sources --- drop column package_id; +alter table na_sources + drop column package_id; -- add on delete cascade so packages can uninstall cleanly -- doing this for now, may eventually move this data to the user preferences package Index: openacs-4/packages/news-aggregator/tcl/aggregator-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/aggregator-procs-postgresql.xql,v diff -u -r1.2.2.3 -r1.2.2.4 --- openacs-4/packages/news-aggregator/tcl/aggregator-procs-postgresql.xql 18 Jan 2006 15:25:17 -0000 1.2.2.3 +++ openacs-4/packages/news-aggregator/tcl/aggregator-procs-postgresql.xql 28 Jan 2006 04:17:43 -0000 1.2.2.4 @@ -42,7 +42,7 @@ where a.package_id = :package_id and a.aggregator_id = :aggregator_id $items_purges - order by item_pub_date desc + order by sort_date desc limit $sql_limit Index: openacs-4/packages/news-aggregator/www/aggregator-tabs.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/Attic/aggregator-tabs.adp,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/news-aggregator/www/aggregator-tabs.adp 4 Jan 2006 05:31:08 -0000 1.1.2.1 +++ openacs-4/packages/news-aggregator/www/aggregator-tabs.adp 28 Jan 2006 04:17:44 -0000 1.1.2.2 @@ -13,7 +13,7 @@ -
General
+
General
 Index: openacs-4/packages/news-aggregator/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/index.adp,v diff -u -r1.12.2.9 -r1.12.2.10 --- openacs-4/packages/news-aggregator/www/index.adp 18 Jan 2006 15:25:17 -0000 1.12.2.9 +++ openacs-4/packages/news-aggregator/www/index.adp 28 Jan 2006 04:17:44 -0000 1.12.2.10 @@ -1,52 +1,43 @@ - @page_title@ - @context@ - +@page_title@ +@context@ +@package_css;noquote@ - - - - - - -
-

@aggregator_name;noquote@

- - @aggregator_description;noquote@ - - - This page lists the most recent items from the feeds you've subscribed to. - -

- - You can hit the Purge button to clean out the page. Clicking the Save button will prevent an item from being purged. - - - Click the Blog button to post the item to a weblog (you will have a choice of weblogs to post to). - -

- - - - - -
+
+ + + + + + + + + @aggregator_description;noquote@ +
+ - -
-

+ +

+ This page lists the most recent items from the feeds you've subscribed to. + + +
+ + You can hit the Purge button to clean out the page. Clicking the Save button will prevent an item from being purged. + + + Click the Blog button to post the item to a weblog (you will have a choice of weblogs to post to). + +
+ +
+ Manage Reader Manage @instance_name@ -
-

- - -

- + + #news-aggregator.No_items# @@ -64,7 +55,6 @@ -

#news-aggregator.Purges# #news-aggregator.On# | #news-aggregator.Off# @@ -75,4 +65,3 @@ #news-aggregator.Purges# #news-aggregator.On# | #news-aggregator.Off#

- 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.7 -r1.9.2.8 --- openacs-4/packages/news-aggregator/www/index.tcl 18 Jan 2006 15:25:17 -0000 1.9.2.7 +++ openacs-4/packages/news-aggregator/www/index.tcl 28 Jan 2006 04:17:44 -0000 1.9.2.8 @@ -17,6 +17,8 @@ set enable_purge_p [parameter::get -package_id $package_id -parameter EnablePurgeP -default 1] set multiple_aggregators_p [parameter::get -package_id $package_id -parameter MultipleAggregatorsP -default 1] set allow_aggregator_edit_p [parameter::get -package_id $package_id -parameter AllowAggregatorEditP -default 1] +set stylesheet_url [parameter::get -package_id $package_id -parameter StylesheetURL] +set package_css "" if { !$aggregator_id } { # Check whether the user has an aggregator @@ -173,10 +175,11 @@ item_blog_url technorati_url item_guid_link - pub_sort_date chunk_updated - pub_date - pub_time + pub_datestamp + pub_timestamp + pub_time_pretty + inner_sort_col } items items $items_query { if { $enable_purge_p } { # Top is the first item @@ -219,20 +222,22 @@ } 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 localtime [clock scan [lc_time_utc_to_local $item_pub_date]] - set pub_date [clock scan [clock format $localtime -format "%Y-%m-%d 00:00:00"]] - set chunk_updated [news_aggregator::chunk_updated [expr [expr [clock seconds] - $pub_date] / 60]] - if { $pub_date > [clock scan "2 days ago" -gmt 1] } { - set pub_time [clock format $localtime -format "%I:%M %p"] + set pub_timestamp [clock scan [lc_time_utc_to_local $item_pub_date]] + 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]] + + if { $pub_datestamp > [clock scan "2 days ago" -gmt 1] } { + set pub_time_pretty [clock format $pub_timestamp -format "%I:%M %p"] } else { - set pub_time [clock format $localtime -format "%d %b %Y %I:%M %p"] + set pub_time_pretty [clock format $pub_timestamp -format "%d %b %Y %I:%M %p"] } - + if { [string equal $write_p "1"] } { if { [lsearch $saved_items $item_id] == -1 } { set save_url [export_vars -base "${url}item-save" {item_id}] @@ -254,6 +259,8 @@ } } +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" && Index: openacs-4/packages/news-aggregator/www/multi-source-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/Attic/multi-source-chunk.adp,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/news-aggregator/www/multi-source-chunk.adp 18 Jan 2006 15:25:17 -0000 1.1.2.1 +++ openacs-4/packages/news-aggregator/www/multi-source-chunk.adp 28 Jan 2006 04:17:44 -0000 1.1.2.2 @@ -1,24 +1,24 @@ - -
- @items.title;noquote@, from @items.chunk_updated@ + +
+ @items.title;noquote@, from @items.chunk_updated@
- + -
+
-
+
- @items.item_title;noquote@ + @items.item_title;noquote@
-
Posted: @items.pub_time@ +
Posted: @items.pub_time_pretty@ - # + #
@items.content;noquote@ -
+
Save @@ -34,10 +34,10 @@
-
+
- @items.item_title;noquote@ - Posted: @items.pub_time@  + @items.item_title;noquote@ + Posted: @items.pub_time_pretty@ #   @@ -51,7 +51,8 @@ Blog -
+ +
Index: openacs-4/packages/news-aggregator/www/single-source-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/Attic/single-source-chunk.adp,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/news-aggregator/www/single-source-chunk.adp 18 Jan 2006 15:25:17 -0000 1.1.2.1 +++ openacs-4/packages/news-aggregator/www/single-source-chunk.adp 28 Jan 2006 04:17:44 -0000 1.1.2.2 @@ -1,23 +1,23 @@ -
- @items.title;noquote@, from @items.chunk_updated@ +
+ @items.title;noquote@, from @items.chunk_updated@
- + -
+
-
+
- @items.item_title;noquote@ + @items.item_title;noquote@
-
Posted: @items.pub_time@ +
Posted: @items.pub_time_pretty@ #
@items.content;noquote@ -
+
Save @@ -33,10 +33,10 @@
-
+
- @items.item_title;noquote@ - Posted: @items.pub_time@  + @items.item_title;noquote@ + Posted: @items.pub_time_pretty@ #   @@ -50,7 +50,8 @@ Blog -
+ +
\ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/news-aggregator/www/resources/news-aggregator.css'. Fisheye: No comparison available. Pass `N' to diff?