Index: openacs-4/packages/weblogger-portlet/www/weblogger-portlet-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/weblogger-portlet/www/weblogger-portlet-postgresql.xql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/weblogger-portlet/www/weblogger-portlet-postgresql.xql 22 Aug 2003 11:18:28 -0000 1.2 +++ openacs-4/packages/weblogger-portlet/www/weblogger-portlet-postgresql.xql 17 Oct 2003 00:39:56 -0000 1.3 @@ -5,25 +5,26 @@ - select entry_id, + select e.entry_id, acs_object__name(apm_package__parent_id(e.package_id)) as parent_name, (select site_node__url(site_nodes.node_id) from site_nodes where site_nodes.object_id = e.package_id) as base_url, - title, - content, - p.first_names as poster_first_names, - p.last_name as poster_last_name, - to_char(posted_date , 'HH24:MI') as posted_time_pretty, - package_id - from pinds_blog_entries e join + e.title, + e.content, + u.first_names as poster_first_names, + u.last_name as poster_last_name, + to_char(e.posted_date , 'HH24:MI') as posted_time_pretty, + p.package_id + from apm_packages p left outer join + pinds_blog_entries e on (e.package_id = p.package_id) join acs_objects o on (o.object_id = e.entry_id) join - persons p on (p.person_id = o.creation_user) - where package_id in ([join $list_of_package_ids ", "]) - and entry_date > current_timestamp - interval '30 days' - and draft_p = 'f' - and deleted_p = 'f' - order by entry_date desc, posted_date desc + all_users u on (u.user_id = o.creation_user) + where p.package_id in ([join $list_of_package_ids ", "]) + and e.entry_date > current_timestamp - interval '30 days' + and e.draft_p = 'f' + and e.deleted_p = 'f' + order by p.package_id asc, e.entry_date desc, e.posted_date desc