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.23 -r1.24
--- openacs-4/packages/lars-blogger/tcl/entry-procs.tcl	25 Apr 2005 14:22:44 -0000	1.23
+++ openacs-4/packages/lars-blogger/tcl/entry-procs.tcl	16 Oct 2006 15:21:53 -0000	1.24
@@ -221,23 +221,22 @@
     set blog_name [lars_blog_name -package_id $blog(package_id)]
 
     set new_content ""
-    append new_content "$blog(title)\n[string repeat "-" [string length $blog(title)]]\n"
+
     if { ![empty_string_p $blog(title_url)] } {
-        append new_content "$blog(title_url)\n"
+        append new_content "<a href=\"$blog(title_url)\">$blog(title)</a>"
+    } else {
+	append new_content "$blog(title)"
     }
-    append new_content "\n"
+    append new_content "<br>[string repeat "-" [string length $blog(title)]]<p>"
 
-    lars_blogger::entry::htmlify \
-        -array blog
+    append new_content "$blog(content)<p>"
+    append new_content "$blog(entry_date_pretty) by $blog(poster_first_names) $blog(poster_last_name)<p>"
 
-    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<br>"
+    append new_content "$blog_name: $blog_url<br>"
 
-    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<br>"
+    append new_content "$blog_name: $blog_url<p>"
     
     # 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-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-callback-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/lars-blogger/tcl/lars-blogger-callback-procs.tcl	25 May 2006 13:19:17 -0000	1.2
+++ openacs-4/packages/lars-blogger/tcl/lars-blogger-callback-procs.tcl	16 Oct 2006 15:21:53 -0000	1.3
@@ -42,26 +42,28 @@
     
     return $result
 }
+
+#Callbacks for application-track
+
 ad_proc -callback application-track::getApplicationName -impl weblogger {} { 
         callback implementation 
     } {
         return "weblogger"
     }    
     
-    ad_proc -callback application-track::getGeneralInfo -impl weblogger {} { 
+ad_proc -callback application-track::getGeneralInfo -impl weblogger {} { 
         callback implementation 
     } {
 	db_1row my_query {
     		select count(1) as result
 			from pinds_blog_entries w,  dotlrn_communities com
 		    	where com.community_id=:comm_id
-		    	and w.deleted_p = 'f'
 			and apm_package__parent_id(w.package_id) = com.package_id	
 	}
 	
 	return "$result"
     }
-    ad_proc -callback application-track::getSpecificInfo -impl weblogger {} { 
+ad_proc -callback application-track::getSpecificInfo -impl weblogger {} { 
         callback implementation 
     } {
    	
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.25 -r1.26
--- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl	15 Jun 2005 18:41:49 -0000	1.25
+++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl	16 Oct 2006 15:21:53 -0000	1.26
@@ -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.12
--- 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	16 Oct 2006 15:21:53 -0000	1.12
@@ -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/blog-months.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog-months.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/lars-blogger/www/blog-months.tcl	8 Aug 2006 21:26:57 -0000	1.6
+++ openacs-4/packages/lars-blogger/www/blog-months.tcl	16 Oct 2006 15:21:54 -0000	1.7
@@ -1,4 +1,4 @@
-if {![exists_and_not_null package_id]} {
+if { ![info exists package_id] } {
     set package_id [ad_conn package_id]
 }
 set package_url [lindex [site_node::get_url_from_object_id -object_id $package_id] 0]
Index: openacs-4/packages/lars-blogger/www/entry-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.adp,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/lars-blogger/www/entry-chunk.adp	8 Aug 2006 21:26:57 -0000	1.30
+++ openacs-4/packages/lars-blogger/www/entry-chunk.adp	16 Oct 2006 15:21:54 -0000	1.31
@@ -3,7 +3,7 @@
 <div class="lars_blogger_entry">
 
   <div class="lars_blogger_title">
-    <p>
+   <p>
     <if @blog.title_url@ not nil>
       <a href="@blog.title_url@"><b><if @blog.title@ not nil>@blog.title;noquote@</if><else>@blog.title_url@</else></b></a>
 
@@ -16,7 +16,7 @@
         <b>@blog.title;noquote@</b>
       </if>
     </else>
-    </p>
+   </p>
   </div> 
 
   <div class="lars_blogger_text">
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.5 -r1.6
--- openacs-4/packages/lars-blogger/www/index.vuh	20 Sep 2006 17:05:41 -0000	1.5
+++ openacs-4/packages/lars-blogger/www/index.vuh	16 Oct 2006 15:21:54 -0000	1.6
@@ -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 {
 
@@ -41,16 +58,9 @@
                     set year [lindex $date_list 0]
                     set month [format "%02d" [lindex $date_list 1]]
           }
-
-	# We need to get rid of the first form element for year month and day
-	# Otherwise we would have it there twice, which does not make that much sense :)
-	set form [rp_getform]
-	ns_set idelkey $form year
-	ns_set idelkey $form month
-	ns_set idelkey $form day	
-	rp_form_put year $year	
-	rp_form_put month $month	
-	rp_form_put day $day	
+          rp_form_put year $year
+          rp_form_put month $month
+          rp_form_put day $day
     } elseif {[regexp {^/+swcat/+([^/]+)/*} $rest_url \
                   ignore_whole sw_category_id]} {
 
@@ -77,5 +87,4 @@
 
 }
 
-
 rp_internal_redirect "/packages/lars-blogger/www/index"
Index: openacs-4/packages/lars-blogger/www/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/lars-blogger/www/index.xql	11 Nov 2005 14:24:03 -0000	1.7
+++ openacs-4/packages/lars-blogger/www/index.xql	16 Oct 2006 15:21:54 -0000	1.8
@@ -4,9 +4,9 @@
 
     <fullquery name="archive_date_year">
         <querytext>
-			select to_date(:year || '-01-01', 'YYYY-MM-DD') 
+			select to_date(:year || '-01-01') 
 				as archive_date, 
-			to_char(to_date(:year || '-01-01', 'YYYY-MM-DD'), 'YYYY')
+			to_char(to_date(:year || '-01-01'), 'YYYY')
 				as archive_date_pretty
 			from dual
         </querytext>
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.5
--- 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	16 Oct 2006 15:21:54 -0000	1.5
@@ -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
 }