Index: openacs-4/packages/rss-support/tcl/rss-support-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/tcl/rss-support-procs.tcl,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/rss-support/tcl/rss-support-procs.tcl 23 Jan 2005 21:20:24 -0000 1.1.2.3 +++ openacs-4/packages/rss-support/tcl/rss-support-procs.tcl 4 Feb 2005 18:25:10 -0000 1.1.2.4 @@ -88,11 +88,10 @@ @error } { - set impl_id [acs_sc::impl::get_id \ - -name $impl_name \ - -contract RssGenerationSubscriber \ - -owner $owner] - set subscr_id [db_string get_subscr_id ""] + set subscr_id [rss_support::get_subscr_id \ + -summary_context_id $summary_context_id \ + -impl_name $impl_name] + set report_dir [rss_gen_report_dir -subscr_id $subscr_id] # remove generated RSS reports for this subscription file delete -force $report_dir @@ -119,3 +118,30 @@ } { return [db_string subscription_exists "" -default 0] } + +ad_proc -public rss_support::get_subscr_id { + -summary_context_id + -impl_name + -owner +} { + + Return subscription id + + @author Dave Bauer (dave@thedesignexperience.org) + @creation-date 2005-02-04 + + @param summary_context_id Object_id subscribed to + + @param impl_name Implementation (object_type) name + + @param owner Owner of implementation (package_key) + @return + + @error +} { + set impl_id [acs_sc::impl::get_id \ + -name $impl_name \ + -contract RssGenerationSubscriber \ + -owner $owner] + return [db_string get_subscr_id ""] +} Index: openacs-4/packages/rss-support/tcl/rss-support-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/tcl/rss-support-procs.xql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/rss-support/tcl/rss-support-procs.xql 4 Feb 2005 16:11:07 -0000 1.1.2.1 +++ openacs-4/packages/rss-support/tcl/rss-support-procs.xql 4 Feb 2005 18:25:10 -0000 1.1.2.2 @@ -18,7 +18,7 @@ - + select subscr_id from rss_gen_subscrs