Index: openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql	11 Dec 2003 21:40:05 -0000	1.6
+++ openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql	13 Dec 2003 17:13:34 -0000	1.7
@@ -28,6 +28,8 @@
                            b.title, 
                            b.title_url, 
                            b.category_id, 
+	           	   c.name as category_name,
+                   	   c.short_name as category_short_name,
                            b.content, 
                            b.content_format, 
                            b.draft_p, 
@@ -44,11 +46,13 @@
 		            and content_item.get_live_revision(gc.comment_id) = cr.revision_id) as num_comments
 		    from   pinds_blog_entries b,
                            acs_objects o,
-                           persons p
+                           persons p,
+	                   pinds_blog_categories c
 		    where  b.entry_id = :entry_id
                     and    o.object_id = b.entry_id
                     and    p.person_id = o.creation_user
-            and    b.deleted_p = 'f'
+	            and    c.category_id (+) = b.category_id
+                    and    b.deleted_p = 'f'
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql	11 Dec 2003 21:40:05 -0000	1.6
+++ openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql	13 Dec 2003 17:13:34 -0000	1.7
@@ -27,6 +27,8 @@
                    b.title, 
                    b.title_url, 
                    b.category_id, 
+	           c.name as category_name,
+                   c.short_name as category_short_name,
                    b.content, 
                    b.content_format, 
                    b.draft_p, 
@@ -41,9 +43,10 @@
                     from general_comments gc, cr_revisions cr 
                     where gc.object_id = entry_id
                     and   content_item__get_live_revision(gc.comment_id) = cr.revision_id) as num_comments
-            from   pinds_blog_entries b,
+            from   pinds_blog_entries b left outer join
+	           pinds_blog_categories c on (c.category_id = b.category_id),
                    acs_objects o,
-                   persons p
+                   persons p 
             where  b.entry_id = :entry_id
             and    o.object_id = b.entry_id
             and    p.person_id = o.creation_user
Index: openacs-4/packages/lars-blogger/tcl/entry-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/entry-procs.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/lars-blogger/tcl/entry-procs.tcl	13 Dec 2003 14:53:28 -0000	1.12
+++ openacs-4/packages/lars-blogger/tcl/entry-procs.tcl	13 Dec 2003 17:13:34 -0000	1.13
@@ -50,14 +50,6 @@
     upvar $array row
 
     db_1row select_entry {} -column_array row 
-
-    # If there's a category set up for the entry, we need to fill the array with the proper information.
-    if { $row(category_id) > 0 } {
-        set category_id $row(category_id)
-        db_1row select_category { *SQL* }
-        set row(category_name) $category_name
-        set row(category_short_name) $category_short_name
-    }
 }
 
 ad_proc -public lars_blogger::entry::publish {
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/tcl/entry-procs.xql'.
Fisheye: No comparison available.  Pass `N' to diff?