Index: openacs-4/packages/lars-blogger/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.tcl,v diff -u -r1.22.2.1 -r1.22.2.2 --- openacs-4/packages/lars-blogger/www/index.tcl 16 Apr 2004 17:11:36 -0000 1.22.2.1 +++ openacs-4/packages/lars-blogger/www/index.tcl 20 May 2004 09:41:14 -0000 1.22.2.2 @@ -46,20 +46,6 @@ set category_id "" } -# SWC - -if { ![empty_string_p $sw_category_id] } { - set sw_category_name [category::get_name $sw_category_id] - if { [empty_string_p $sw_category_name] } { - ad_return_exception_page 404 "No such category" "Site-wide \ - Category with ID $sw_category_id doesn't exist" - return - } - # Show Category in context bar - append context_base_url /swcat/$sw_category_id - lappend context [list $context_base_url $sw_category_name] -} - # Set up the elements for the HTML # 3 items - RSS, RSD and stylesheet. set rss_file_url "" @@ -178,18 +164,31 @@ db_multirow categories categories {} -# SWC +# Site-Wide Categories -db_multirow -unclobber -extend {sw_category_name tree_name} \ - sw_categories sw_categories { - select c.category_id as sw_category_id, c.tree_id - from categories c, category_tree_map ctm - where ctm.tree_id = c.tree_id - and ctm.object_id = :package_id} { - set sw_category_name [category::get_name $sw_category_id] - set tree_name [category_tree::get_name $tree_id] +if { ![empty_string_p $sw_category_id] } { + set sw_category_name [category::get_name $sw_category_id] + if { [empty_string_p $sw_category_name] } { + ad_return_exception_page 404 "No such category" "Site-wide \ + Category with ID $sw_category_id doesn't exist" + return + } + # Show Category in context bar + append context_base_url /swcat/$sw_category_id + lappend context [list $context_base_url $sw_category_name] + set type "all" } +db_multirow -unclobber -extend { sw_category_name tree_name } sw_categories sw_categories { + select c.category_id as sw_category_id, c.tree_id + from categories c, category_tree_map ctm + where ctm.tree_id = c.tree_id + and ctm.object_id = :package_id +} { + set sw_category_name [category::get_name $sw_category_id] + set tree_name [category_tree::get_name $tree_id] +} + # Cut the URL off the last item in the context bar if { [llength $context] > 0 } { set context [lreplace $context end end [lindex [lindex $context end] end]]