" - lars_blogger::entry::htmlify \ - -array blog + append new_content "$blog(content)
" + append new_content "$blog(entry_date_pretty) by $blog(poster_first_names) $blog(poster_last_name)
"
- append new_content "[ad_html_text_convert -from text/html -to text/plain -- $blog(content)]\n\n"
- append new_content "$blog(entry_date_pretty) by $blog(poster_first_names) $blog(poster_last_name)" \n\n
+ append new_content "Permalink: $entry_url
"
+ append new_content "$blog_name: $blog_url
"
- append new_content "Permalink: $entry_url\n\n"
- append new_content "$blog_name: $blog_url\n"
-
- append new_content "This entry: " $entry_url \n\n
- append new_content "$blog_name: " $blog_url \n
+ append new_content "This entry: $entry_url
"
+ append new_content "$blog_name: $blog_url
" # Do the notification for the forum notification::new \ @@ -246,7 +245,7 @@ -object_id $blog(package_id) \ -response_id $blog(entry_id) \ -notif_subject $blog(title) \ - -notif_text $new_content + -notif_html $new_content } ad_proc lars_blogger::entry::trackback { -entry_id } { Index: openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl,v diff -u -r1.23.2.3 -r1.23.2.4 --- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl 19 Jul 2005 22:08:28 -0000 1.23.2.3 +++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl 15 Oct 2006 09:00:46 -0000 1.23.2.4 @@ -42,7 +42,7 @@ db_dml update_subscr {} } # Run it now - rss_gen_report $subscr_id + # rss_gen_report $subscr_id } if { [parameter::get -parameter "user_rss_feed_p" -package_id $package_id -default 0] } { @@ -73,7 +73,7 @@ } if { ![empty_string_p $subscr_id] } { # Run it now - rss_gen_report $subscr_id + # rss_gen_report $subscr_id } } } Index: openacs-4/packages/lars-blogger/tcl/rss-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/rss-procs.tcl,v diff -u -r1.11 -r1.11.6.1 --- openacs-4/packages/lars-blogger/tcl/rss-procs.tcl 27 Feb 2004 18:30:58 -0000 1.11 +++ openacs-4/packages/lars-blogger/tcl/rss-procs.tcl 15 Oct 2006 09:00:46 -0000 1.11.6.1 @@ -30,7 +30,7 @@ {-package_id ""} } { foreach subscr_id [lars_blogger::rss::get_subscr_id_list -package_id $package_id] { - rss_gen_report $subscr_id + # rss_gen_report $subscr_id } } Index: openacs-4/packages/lars-blogger/www/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.vuh,v diff -u -r1.4 -r1.4.6.1 --- openacs-4/packages/lars-blogger/www/index.vuh 20 Feb 2004 05:43:02 -0000 1.4 +++ openacs-4/packages/lars-blogger/www/index.vuh 15 Oct 2006 09:00:46 -0000 1.4.6.1 @@ -15,7 +15,24 @@ set summary_context_id [db_string select_user_id $sql] - ns_returnfile 200 text/xml [rss_gen_report_file -summary_context_id $summary_context_id -impl_name pinds_blog_entries] + set datasource [acs_sc_call RssGenerationSubscriber datasource \ + $summary_context_id pinds_blog_entries] + if { [empty_string_p $datasource] } { + ns_log Error "Empty datasource returned from $impl_name for context $summary_context_id in rss_gen_report. Probably because the implementation hasn't been bound." + return + } + set args "" + foreach {name val} $datasource { + regsub -all {[\]\[\{\}""\\$]} $val {\\&} val + append args "-$name \"$val\" " + if { [lsearch [list channel_link channel_title] $name] >= 0 } { + set $name $val + } + } + set xml [apply rss_gen $args] + ns_set put [ns_conn outputheaders] "Content-Disposition" "attachment; filename=\"rss.xml\"" + ReturnHeaders "application/xml" + ns_write $xml } else { Index: openacs-4/packages/lars-blogger/www/rss/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/rss/index.vuh,v diff -u -r1.4 -r1.4.8.1 --- openacs-4/packages/lars-blogger/www/rss/index.vuh 29 Sep 2003 13:50:10 -0000 1.4 +++ openacs-4/packages/lars-blogger/www/rss/index.vuh 15 Oct 2006 09:00:47 -0000 1.4.8.1 @@ -10,7 +10,24 @@ } -default {}] if { ![empty_string_p $summary_context_id] } { - ns_returnfile 200 text/xml [rss_gen_report_file -summary_context_id $summary_context_id -impl_name pinds_blog_entries] + set datasource [acs_sc_call RssGenerationSubscriber datasource \ + $summary_context_id pinds_blog_entries] + if { [empty_string_p $datasource] } { + ns_log Error "Empty datasource returned from $impl_name for context $summary_context_id in rss_gen_report. Probably because the implementation hasn't been bound." + return + } + set args "" + foreach {name val} $datasource { + regsub -all {[\]\[\{\}""\\$]} $val {\\&} val + append args "-$name \"$val\" " + if { [lsearch [list channel_link channel_title] $name] >= 0 } { + set $name $val + } + } + set xml [apply rss_gen $args] + ns_set put [ns_conn outputheaders] "Content-Disposition" "attachment; filename=\"rss.xml\"" + ReturnHeaders "application/xml" + ns_write $xml } else { ns_returnnotfound }