Index: openacs-4/packages/xowiki/tcl/weblog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/weblog-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/xowiki/tcl/weblog-procs.tcl	3 Jan 2007 14:03:58 -0000	1.4
+++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl	3 Jan 2007 20:36:12 -0000	1.5
@@ -78,7 +78,8 @@
  
     set sql \
         [list -folder_id $folder_id \
-             -select_attributes [list p.publish_date p.title p.creator p.creation_user p.description] \
+             -select_attributes [list p.publish_date p.title p.creator p.creation_user \
+                                     p.description s.body] \
              -order_clause "order by p.publish_date desc" \
              -page_number $page_number -page_size $page_size \
              -extra_from_clause $extra_from_clause \
@@ -93,7 +94,7 @@
     
     set s [::xowiki::Page instantiate_objects -sql [eval ::xowiki::Page select_query $sql]]
     foreach c [$s children] {
-      $c instvar page_id publish_date title name item_id creator creation_user description
+      $c instvar page_id publish_date title name item_id creator creation_user description body
 
       regexp {^([^.]+)[.][0-9]+(.*)$} $publish_date _ publish_date tz
       set pretty_date [util::age_pretty -timestamp_ansi $publish_date \
@@ -104,7 +105,8 @@
         # we need always: package_id name title creator creation_user pretty_date
         set p [Page new -package_id $package_id -name $name -title $title -creator $creator]
         $p set creation_user $creation_user
-        $p set description $description
+        $p set description [expr {$description eq "" && $body ne ""? \
+                                      "[string range $body 0 150]..." : $description}]
       } else {
         # do full instantiation and rendering
         # ns_log notice "--Render object=$p, $page_id $name $title"
@@ -187,7 +189,7 @@
     append content "<DIV class='post' style='clear: both;'>" \
         "<h2><a href='$link'>$title</a></h2>" \
         "<p class='auth'>Created by $creator, " \
-        "last modfified by [::xo::get_user_name $creation_user] " \
+        "last modfied by [::xo::get_user_name $creation_user] " \
         "<span class='date'>$pretty_date</span></p>" \
         $description $more \n\
         "</DIV>"
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.65 -r1.66
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	31 Dec 2006 16:47:00 -0000	1.65
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	3 Jan 2007 20:36:12 -0000	1.66
@@ -207,7 +207,10 @@
     } else {
       set pagination ""
     }
-    return "select $attribute_selection from xowiki_pagei p, cr_items ci $extra_from_clause \
+    set outer_join [expr {[string first s. $attribute_selection] > -1 ?
+                          "left outer join syndication s on s.object_id = p.revision_id" : ""}]
+
+    return "select $attribute_selection from xowiki_pagei p $outer_join, cr_items ci $extra_from_clause \
         where ci.parent_id = $folder_id and ci.item_id = p.item_id and \
         ci.live_revision = p.page_id $where_clause $extra_where_clause $order_clause $pagination"
   }