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.22 -r1.23 --- openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl 7 Aug 2017 23:48:29 -0000 1.22 +++ openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl 3 Sep 2024 15:37:54 -0000 1.23 @@ -10,51 +10,74 @@ ad_proc -private rss_gen_service {} { - ns_log Debug "rss_gen_service: starting" + if {[parameter::get_global_value \ + -package_key rss-support \ + -parameter RssGenActiveP \ + -default 1]} { - # Bind any unbound implementations - rss_gen_bind + ns_log Debug "rss_gen_service: starting" - set n 0 + # Bind any unbound implementations + rss_gen_bind - db_foreach timed_out_subscriptions {} { - set lastupdate [acs_sc::invoke -contract RssGenerationSubscriber -operation lastUpdated -call_args $summary_context_id -impl $impl_name] - if { $lastupdate > $lastbuild } { - # Old report is stale. Build a new one. - rss_gen_report $subscr_id - incr n - } - } + set n 0 - ns_log Debug "rss_gen_service: built $n reports" + db_foreach timed_out_subscriptions {} { + set lastupdate [acs_sc::invoke \ + -contract RssGenerationSubscriber \ + -operation lastUpdated \ + -call_args $summary_context_id \ + -impl $impl_name] + if { $lastupdate > $lastbuild } { + # Old report is stale. Build a new one. + rss_gen_report $subscr_id + incr n + } + } + ns_log Debug "rss_gen_service: built $n reports" + } { + ns_log Debug "rss_gen_service: disabled by RssGenActiveP global parameter" + } } -ad_proc -private rss_gen_report subscr_id { +ad_proc -public rss_gen_report { + subscr_id +} { Build a report, write it out, log it. } { set start [clock seconds] db_1row subscr_info {} - set datasource [acs_sc::invoke -contract RssGenerationSubscriber -operation datasource -call_args $summary_context_id -impl $impl_name] + set datasource [acs_sc::invoke \ + -contract RssGenerationSubscriber \ + -operation datasource \ + -call_args $summary_context_id \ + -impl $impl_name] if { $datasource eq "" } { - 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." + 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 - } + regsub -all {[\]\[\{\}""\\$]} $val {\\&} val + append args "-$name \"$val\" " + if { [lsearch [list channel_link channel_title] $name] >= 0 } { + set $name $val + } } - set xml [ad_apply rss_gen $args] + #ns_log notice "FORMER ad_apply [list rss_gen {*}$args]" + set xml [rss_gen {*}$args] # Write report. - set report_file [rss_gen_report_file -summary_context_id $summary_context_id -impl_name $impl_name -assert] + set report_file [rss_gen_report_file \ + -summary_context_id $summary_context_id \ + -impl_name $impl_name \ + -assert] set fh [open $report_file w] puts $fh $xml @@ -65,29 +88,26 @@ # subscriptions table. set extra_sql "" foreach col [list channel_title channel_link] { - if {[info exists $col]} { - append extra_sql ", $col = :$col" - } + if {[info exists $col]} { + append extra_sql ", $col = :$col" + } } set last_ttb [expr {[clock seconds] - $start}] db_dml update_timestamp {} } -ad_proc -private rss_assert_dir path { +ad_proc -deprecated rss_assert_dir path { Steps through path creating each new directory as needed. Accepts full path or relative path, but you probably want to specify the full path. -

- Makes no attempt to catch errors. + + DEPRECATED: the tcl file mkdir subcommand will create the whole + missing folder structure without complaining + + @see file } { - set running_path "" - foreach dir [split $path /] { - append running_path ${dir}/ - if {![file exists $running_path]} { - file mkdir $running_path - } - } + file mkdir $path } ad_proc -private rss_gen_bind {} { @@ -96,14 +116,14 @@ set contract_id [db_string get_contract_id {}] db_foreach get_unbound_impls {} { - ns_log Debug "rss_gen_bind: binding impl $impl_id for contract $contract_id" - # Don't ask me why, but bind variables don't appear to work - # in this nested db operation. - if {[catch { - db_exec_plsql bind_impl {} - } errMsg]} { - ns_log Warning "rss_gen_bind: error binding impl $impl_id for contract $contract_id: $errMsg" - } + ns_log Debug "rss_gen_bind: binding impl $impl_id for contract $contract_id" + # Don't ask me why, but bind variables don't appear to work + # in this nested db operation. + if {[catch { + db_exec_plsql bind_impl {} + } errMsg]} { + ns_log Warning "rss_gen_bind: error binding impl $impl_id for contract $contract_id: $errMsg" + } } } @@ -118,17 +138,20 @@ provided. If the assert flag is set, create the directory. } { if {!([info exists summary_context_id] && [info exists impl_name]) } { - if {![info exists subscr_id]} { - error "rss_gen_report_dir needs either subscr_id or impl_id+summary_context_id" - } else { - db_1row subscr_context_and_impl {} - } + if {![info exists subscr_id]} { + error "rss_gen_report_dir needs either subscr_id or impl_id+summary_context_id" + } else { + db_1row subscr_context_and_impl {} + } } - set report_dir [acs_root_dir]/[parameter::get -package_id [rss_package_id] -parameter RssGenOutputDirectory -default rss]/$impl_name/${summary_context_id} + set report_dir [acs_root_dir]/[parameter::get \ + -package_id [rss_package_id] \ + -parameter RssGenOutputDirectory \ + -default rss]/$impl_name/$summary_context_id if {$assert_p} { - rss_assert_dir $report_dir + file mkdir $report_dir } return $report_dir @@ -144,26 +167,20 @@ or impl_name + summary_context_id provided. If the -assert flag is set, the parent directory is created if it doesn't exist - @return a Unix file path. + @return a Unix file path. } { if {!([info exists summary_context_id] && [info exists impl_name])} { - if {![info exists subscr_id]} { - error "rss_gen_report_file needs either subscr_id or impl_id+summary_context_id" - } else { - db_1row subscr_context_and_impl {} - } + if {![info exists subscr_id]} { + error "rss_gen_report_file needs either subscr_id or impl_id+summary_context_id" + } else { + db_1row subscr_context_and_impl {} + } } - if {$assert_p} { - set report_dir [rss_gen_report_dir \ - -summary_context_id $summary_context_id \ - -impl_name $impl_name \ - -assert] - } else { - set report_dir [rss_gen_report_dir \ - -summary_context_id $summary_context_id \ - -impl_name $impl_name] - } + set report_dir [rss_gen_report_dir \ + -summary_context_id $summary_context_id \ + -impl_name $impl_name \ + -assert=$assert_p] set report_file $report_dir/rss.xml