Index: openacs-4/packages/lars-blogger/www/blog.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/lars-blogger/www/blog.tcl	14 Dec 2003 11:10:44 -0000	1.17
+++ openacs-4/packages/lars-blogger/www/blog.tcl	13 Feb 2004 00:32:16 -0000	1.18
@@ -26,6 +26,13 @@
     set blog_category_id $category_id
 }
 
+# SWC
+if { ![info exists sw_category_id] } {
+    set blog_sw_category_id {}
+} else {
+    set blog_sw_category_id $sw_category_id
+}
+
 if { ![info exists screen_name] } {
     set screen_name ""
     set blog_user_id {}
@@ -115,23 +122,24 @@
     set arr_category_short_name($category_id) $short_name
 }
 
-
 if { [empty_string_p $blog_user_id] } {
-    db_multirow -extend {category_name category_short_name} blog all_blogs {} {
-        if { [string length $blog_category_id] && $category_id != $blog_category_id } {continue}
-        set category_name "$arr_category_name($category_id)"
-        set category_short_name $arr_category_short_name($category_id)
-    }
+    set blog_query_name all_blogs
     set archive_url "${package_url}archive/"
 } else {
-    db_multirow -extend {category_name category_short_name} blog blog {} {
-        if { [string length $blog_category_id] && $category_id != $blog_category_id } {continue}
-        set category_name "$arr_category_name($category_id)"
-        set category_short_name $arr_category_short_name($category_id)
-    }
+    set blog_query_name blog
     set archive_url "${package_url}user/$screen_name/archive/"
 }
 
+
+db_multirow -extend {category_name category_short_name } \
+      blog $blog_query_name {} {
+    if { [string length $blog_category_id] && \
+      $category_id != $blog_category_id} {continue}
+
+    set category_name "$arr_category_name($category_id)"
+    set category_short_name $arr_category_short_name($category_id)
+}
+
 set arrow_url "${package_url}graphics/arrow-box.gif"
 
 set entry_add_url "${package_url}entry-edit"
Index: openacs-4/packages/lars-blogger/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.adp,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/lars-blogger/www/index.adp	22 Dec 2003 18:47:54 -0000	1.29
+++ openacs-4/packages/lars-blogger/www/index.adp	13 Feb 2004 00:32:16 -0000	1.30
@@ -38,7 +38,7 @@
 
     <div id="lars_blogger_left">
       <div class="lars_blogger_content_table">
-        <include src="blog" type="@type@" archive_interval="@interval@" archive_date="@archive_date@" screen_name="@screen_name@" category_id="@category_id@">
+        <include src="blog" type="@type@" archive_interval="@interval@" archive_date="@archive_date@" screen_name="@screen_name@" category_id="@category_id@" sw_category_id="@sw_category_id@">
       </div>
     </div>
 
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.19 -r1.20
--- openacs-4/packages/lars-blogger/www/index.tcl	4 Feb 2004 20:50:56 -0000	1.19
+++ openacs-4/packages/lars-blogger/www/index.tcl	13 Feb 2004 00:32:16 -0000	1.20
@@ -1,3 +1,6 @@
+namespace eval ::lars_blogger {
+uplevel {
+
 ad_page_contract {
     The Weblogger index page.
 
@@ -47,8 +50,8 @@
 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_error "No such category" "Site-wide Category with ID \
-          $sw_category_id doesn't exist"
+        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
@@ -166,7 +169,14 @@
 
 db_multirow categories categories {}
 
+# SWC
+# Proc to retrieve all trees and categories goes here...
+
 # 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]]
 }
+
+
+}
+}