Index: openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql 28 Sep 2003 16:24:52 -0000 1.4 +++ openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql 29 Sep 2003 19:53:30 -0000 1.5 @@ -11,25 +11,26 @@ - select entry_id, - title, - content, - entry_date, - posted_date, - to_char(posted_date, 'YYYY-MM-DD') as posted_date_string, - to_char(posted_date, 'HH:MI') as posted_time_string, - to_char(posted_date, 'YYYY-MM-DD HH24:MI:SS') as posted_time_ansi, + select e.entry_id, + e.title, + e.content, + e.entry_date, + e.posted_date, + to_char(e.posted_date, 'YYYY-MM-DD') as posted_date_string, + to_char(e.posted_date, 'HH:MI') as posted_time_string, + to_char(e.posted_date, 'YYYY-MM-DD HH24:MI:SS') as posted_time_ansi, extract(timezone_hour from now()) as tzoffset_hour, extract(timezone_minute from now()) as tzoffset_minute, - to_char(entry_date, 'DD Mon YYYY hh12:MI am') as entry_date_pretty, - to_char(entry_date, 'YYYY/MM/') as entry_archive_url - - from pinds_blog_entries - where package_id = :package_id - and draft_p = 'f' - and deleted_p = 'f' - order by entry_date desc, posted_date desc - limit 10 + to_char(e.entry_date, 'DD Mon YYYY hh12:MI am') as entry_date_pretty, + to_char(e.entry_date, 'YYYY/MM/') as entry_archive_url, + c.name as category + from pinds_blog_entries e left outer join + pinds_blog_categories c using (category_id) + where e.package_id = :package_id + and e.draft_p = 'f' + and e.deleted_p = 'f' + order by e.entry_date desc, e.posted_date desc + limit 10 Index: openacs-4/packages/lars-blogger/tcl/rss-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/rss-procs.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/lars-blogger/tcl/rss-procs.tcl 29 Sep 2003 19:06:37 -0000 1.7 +++ openacs-4/packages/lars-blogger/tcl/rss-procs.tcl 29 Sep 2003 19:53:30 -0000 1.8 @@ -78,13 +78,15 @@ title $title \ description $description \ value $content \ - timestamp $entry_timestamp] - + timestamp $entry_timestamp \ + category $category] + if { $counter == 0 } { - set column_array(channel_lastBuildDate) $entry_date_pretty + set column_array(channel_lastBuildDate) $entry_timestamp incr counter } } + set column_array(items) $items set column_array(channel_language) "" set column_array(channel_copyright) ""