Index: openacs-4/packages/bboard-portlet/www/bboard-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bboard-portlet/www/bboard-portlet.adp,v diff -u -r1.10 -r1.11 --- openacs-4/packages/bboard-portlet/www/bboard-portlet.adp 29 Mar 2002 19:51:44 -0000 1.10 +++ openacs-4/packages/bboard-portlet/www/bboard-portlet.adp 6 Apr 2002 17:58:22 -0000 1.11 @@ -20,19 +20,37 @@ - + - -
    - - - @data@ - - -
- +<% + set new_package_id "" + set old_package_id "" +%> + + + +
  • @forums.community_name@ + + + + + + No Bboards Index: openacs-4/packages/bboard-portlet/www/bboard-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bboard-portlet/www/bboard-portlet.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/bboard-portlet/www/bboard-portlet.tcl 29 Mar 2002 19:51:44 -0000 1.5 +++ openacs-4/packages/bboard-portlet/www/bboard-portlet.tcl 6 Apr 2002 17:58:22 -0000 1.6 @@ -18,52 +18,17 @@ set shaded_p $config(shaded_p) set list_of_instance_ids $config(instance_id) -set data "" -if {[llength $list_of_instance_ids] == 1} { - set one_instance_p 1 -} else { - set one_instance_p 0 -} - - -foreach instance_id $list_of_instance_ids { - - set comm_url [dotlrn_community::get_url_from_package_id -package_id $instance_id] - set comm_name [site_nodes::get_parent_name \ - -instance_id $instance_id - ] - - set f_count [db_string forum_count {select count(*) from bboard_forums where bboard_id = :instance_id} ] - - if {$f_count == 0} { - set f_check 0 - } else { - set f_check 1 - } - - - if {!$one_instance_p && $f_check} { - append data "
  • $comm_name" - append data "
      " - } - - db_foreach forums_select { - select forum_id, short_name - from bboard_forums - where bboard_id = :instance_id - } { - append data "
    • $short_name" - } - - if {!$one_instance_p && $f_check} { - append data "
    " - } -} - -# portlets shouldn't disappear anymore (ben) -if {[empty_string_p $data]} { - set no_forums_p "t" -} else { - set no_forums_p "f" -} +db_multirow forums select_forums " + select bboard_forums.bboard_id as package_id, + (select apm_packages.instance_name + from apm_packages + where apm_packages.package_id = apm_package.parent_id(bboard_forums.bboard_id)) as community_name, + (select site_node.url(site_nodes.node_id) + from site_nodes + where site_nodes.object_id = bboard_forums.bboard_id) as url, + bboard_forums.forum_id, + bboard_forums.short_name + from bboard_forums + where bboard_forums.bboard_id in ([join $list_of_instance_ids ,]) +" Index: openacs-4/packages/news-portlet/news-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/news-portlet.info,v diff -u -r1.2 -r1.3 --- openacs-4/packages/news-portlet/news-portlet.info 25 Feb 2002 20:37:43 -0000 1.2 +++ openacs-4/packages/news-portlet/news-portlet.info 6 Apr 2002 18:00:06 -0000 1.3 @@ -28,9 +28,9 @@ + - Index: openacs-4/packages/news-portlet/www/news-portlet-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/Attic/news-portlet-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/news-portlet/www/news-portlet-oracle.xql 6 Apr 2002 18:01:38 -0000 1.1 @@ -0,0 +1,25 @@ + + + +oracle8.1.6 + + + + select news_items_approved.package_id, + (select ap1.instance_name + from apm_packages ap1 + where ap1.package_id = apm_package.parent_id(news_items_approved.package_id)) as parent_name, + (select site_node.url(site_nodes.node_id) + from site_nodes + where site_nodes.object_id = news_items_approved.package_id) as url, + news_items_approved.item_id, + news_items_approved.publish_title, + news_items_approved.publish_date + from news_items_approved + where news_items_approved.publish_date < sysdate + and (news_items_approved.archive_date >= sysdate or news_items_approved.archive_date is null) + and news_items_approved.package_id in ([join $list_of_instance_ids ", "]) + + + + Index: openacs-4/packages/news-portlet/www/news-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/news-portlet/www/news-portlet.adp 29 Mar 2002 19:26:23 -0000 1.3 +++ openacs-4/packages/news-portlet/www/news-portlet.adp 6 Apr 2002 18:00:06 -0000 1.4 @@ -20,21 +20,39 @@ - + - +<% + set new_package_id "" + set old_package_id "" +%> + + + +<% set new_package_id $news_items(package_id) %> + + +
  • @news_items.parent_name@ - +<% + set old_package_id $new_package_id +%> + + + + + - @data@ + No News Index: openacs-4/packages/news-portlet/www/news-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/news-portlet/www/news-portlet.tcl 29 Mar 2002 19:26:23 -0000 1.9 +++ openacs-4/packages/news-portlet/www/news-portlet.tcl 6 Apr 2002 18:00:06 -0000 1.10 @@ -17,61 +17,17 @@ # # /news-portlet/www/news-portlet.tcl # -# distributed under the terms of the GNU GPL version 2 -# # arjun@openforce.net # # The logic for the news portlet # # $Id$ # - array set config $cf set shaded_p $config(shaded_p) -set data "" - # Should be a list already! XXX rename me! set list_of_instance_ids $config(community_id) -if {[llength $list_of_instance_ids] == 1} { - set one_instance_p 1 -} else { - set one_instance_p 0 -} - -foreach instance_id $list_of_instance_ids { - - if {[db_string news_items_count {} -default 0]} { - set has_items_p 1 - } else { - set has_items_p 0 - } - - if {$has_items_p} { - set parent_name [site_nodes::get_parent_name -instance_id $instance_id] - set parent_url [dotlrn_community::get_url_from_package_id -package_id $instance_id] - - if {!$one_instance_p} { - append data "
  • $parent_name" - } - - append data "
      " - - db_foreach news_items_select {} { - append data "
    • $publish_title ($publish_date)" - } - - append data "
    " - } - -} - -# portlets shouldn't disappear anymore (ben) -if {[empty_string_p $data]} { - set data "No News" - set no_news_p "t" -} else { - set no_news_p "f" -} +db_multirow news_items select_news_items {} Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/news-portlet/www/news-portlet.xql'. Fisheye: No comparison available. Pass `N' to diff?