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"