Index: openacs-4/packages/rss-support/rss-support.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/rss-support.info,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/rss-support/rss-support.info 16 Oct 2002 07:19:50 -0000 1.6.2.1
+++ openacs-4/packages/rss-support/rss-support.info 18 Oct 2002 20:25:21 -0000 1.6.2.2
@@ -64,7 +64,7 @@
-
+
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.2.1 -r1.10.2.2
--- openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl 8 Oct 2002 07:19:51 -0000 1.10.2.1
+++ openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl 18 Oct 2002 20:25:23 -0000 1.10.2.2
@@ -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
}