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.5 -r1.6 --- openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql 29 Sep 2003 19:53:30 -0000 1.5 +++ openacs-4/packages/lars-blogger/tcl/rss-procs-postgresql.xql 11 Dec 2003 21:40:05 -0000 1.6 @@ -14,15 +14,7 @@ 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(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) @@ -36,28 +28,21 @@ - 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, - 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 e join - acs_objects o on (o.object_id = e.entry_id) join - users u on (u.user_id = o.creation_user) - where e.package_id = :package_id - and o.creation_user = :user_id - and e.draft_p = 'f' - and e.deleted_p = 'f' - order by e.entry_date desc, e.posted_date desc - limit 10 + select e.entry_id, + e.title, + e.content, + to_char(e.posted_date, 'YYYY-MM-DD HH24:MI:SS') as posted_time_ansi, + c.name as category + from pinds_blog_entries e join + acs_objects o on (o.object_id = e.entry_id) join + users u on (u.user_id = o.creation_user) left outer join + pinds_blog_categories c using (category_id) + where e.package_id = :package_id + and o.creation_user = :user_id + and e.draft_p = 'f' + and e.deleted_p = 'f' + order by e.entry_date desc, e.posted_date desc + limit 10