Index: openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl	16 Sep 2002 11:31:48 -0000	1.10
+++ openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl	30 Nov 2002 17:44:11 -0000	1.11
@@ -30,7 +30,7 @@
              acs_sc_impls i
         where i.impl_id = r.impl_id
           and (r.lastbuild is null
-               or now() - r.lastbuild > interval r.timeout || ' seconds')
+               or now() - r.lastbuild > cast(r.timeout || ' seconds' as interval))
     } {
 	set lastupdate [acs_sc_call RssGenerationSubscriber lastUpdated \
 		$summary_context_id $impl_name]
@@ -63,6 +63,7 @@
 	    $summary_context_id $impl_name]
     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
@@ -167,10 +168,10 @@
 	}
     }
 
-    set report_dir /[ad_parameter -package_id [rss_package_id] RssGenOutputDirectory rss-support rss]/$impl_name/${summary_context_id}
+    set report_dir [acs_root_dir]/[ad_parameter -package_id [rss_package_id] RssGenOutputDirectory rss-support rss]/$impl_name/${summary_context_id}
 
     if $assert_p {
-	rss_assert_dir [ns_info pageroot]$report_dir
+	rss_assert_dir $report_dir
     }
 
     return $report_dir
@@ -181,7 +182,6 @@
     -impl_name
     -subscr_id
     -assert:boolean
-    -url:boolean
 } {
     Return a file path for the rss subscription with subscr_id
     or impl_name + summary_context_id provided.
@@ -217,11 +217,7 @@
 		-impl_name $impl_name]
     }
 
-    set report_url $report_dir/rss.xml
+    set report_file $report_dir/rss.xml
 
-    if $url_p {
-	return $report_url
-    } else {
-	return [ns_url2file $report_url]
-    }
+    return $report_file
 }