Index: openacs-4/packages/lars-blogger/www/entry-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/lars-blogger/www/entry-chunk.tcl	27 Feb 2004 16:10:46 -0000	1.17
+++ openacs-4/packages/lars-blogger/www/entry-chunk.tcl	27 Feb 2004 18:30:59 -0000	1.18
@@ -5,6 +5,7 @@
 # package_id:optional
 # screen_name:onevalue,optional
 # perma_p: 1/0 (defaults to 0 -- set to 1 if this is the permalink page)
+# max_content_length:integer,optional
 
 # Nested multirows!
 
@@ -36,6 +37,10 @@
     set screen_name ""
 }
 
+if { ![exists_and_not_null max_content_length] } {
+    set max_content_length 0
+}        
+
 set package_url [lars_blog_public_package_url -package_id $package_id]
 
 set user_id [ad_conn user_id]
@@ -44,36 +49,38 @@
 
 set show_poster_p [ad_parameter "ShowPosterP" "" "1"]
 
-lars_blogger::entry::htmlify -array blog
-
-set entry_id $blog(entry_id)
-
-set blog(edit_url) "${package_url}entry-edit?[export_vars { entry_id return_url }]"
-set blog(delete_url) "${package_url}entry-delete?[export_vars { entry_id return_url }]"
-
-set blog(publish_url) "${package_url}entry-publish?[export_vars { entry_id return_url }]"
-set blog(revoke_url) "${package_url}entry-revoke?[export_vars { entry_id return_url }]"
-
-set blog(write_p) [permission::write_permission_p -object_id $blog(entry_id) -creation_user $blog(user_id) -party_id [ad_conn untrusted_user_id]]
-
 if { [empty_string_p $screen_name] } {
     set blog(permalink_url) "${package_url}one-entry?[export_vars { entry_id }]"
 } else {
     set blog(permalink_url) "${package_url}user/$screen_name/one-entry?[export_vars { entry_id }]"
 }
 
-set display_categories [lars_blog_categories_p -package_id [ad_conn package_id]]
+lars_blogger::entry::htmlify \
+    -max_content_length $max_content_length \
+    -more [ad_decode [ad_return_url] $blog(permalink_url) {} "<br><a href=\"$blog(permalink_url)\">(more)</a>"] \
+    -array blog
 
+set entry_id $blog(entry_id)
+
+set blog(edit_url) [export_vars -base "${package_url}entry-edit" { entry_id return_url }]
+set blog(delete_url) [export_vars -base "${package_url}entry-delete" { entry_id return_url }]
+
+set blog(publish_url) [export_vars -base "${package_url}entry-publish" { entry_id return_url }]
+set blog(revoke_url) [export_vars -base "${package_url}entry-revoke" { entry_id return_url }]
+
+set blog(write_p) [permission::write_permission_p \
+                       -object_id $blog(entry_id) \
+                       -creation_user $blog(user_id) \
+                       -party_id [ad_conn untrusted_user_id]]
+
+set display_categories [lars_blog_categories_p \
+                            -package_id [ad_conn package_id]]
+
 if { [template::util::is_true $show_comments_p] } {
     lars_blogger::entry::get_comments -entry_id $entry_id
-    set blog(comment_add_url) "${general_comments_package_url}comment-add?[export_vars { { object_id $entry_id } { object_name $blog(title) } { return_url "${package_url}flush-cache?[export_vars { return_url }]"} }]"
+    set blog(comment_add_url) [export_vars -base "${general_comments_package_url}comment-add" { { object_id $entry_id } { object_name $blog(title) } { return_url "${package_url}flush-cache?[export_vars { return_url }]"} }]
 }
 
-if { $blog(category_id) != 0 } {
-    set category_url "${package_url}"
-    if { [exists_and_not_null screen_name] } {
-	append category_url "user/$screen_name"
-    }
-    append category_url "/cat/$blog(category_short_name)"
-}
-
+set blog(posted_time_pretty) [util::age_pretty \
+                                 -timestamp_ansi $blog(entry_date_ansi) \
+                                 -sysdate_ansi $blog(sysdate_ansi)]