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 -N -r1.6.2.4 -r1.6.2.5 --- openacs-4/packages/rss-support/rss-support.info 13 Mar 2003 14:24:37 -0000 1.6.2.4 +++ openacs-4/packages/rss-support/rss-support.info 9 May 2003 22:39:43 -0000 1.6.2.5 @@ -8,7 +8,7 @@ t rss-support - + oracle postgresql @@ -29,7 +29,7 @@ - + Index: openacs-4/packages/rss-support/sql/oracle/rss-generation-sc-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/sql/oracle/rss-generation-sc-create.sql,v diff -u -N -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/rss-support/sql/oracle/rss-generation-sc-create.sql 30 Oct 2002 16:10:58 -0000 1.1.2.1 +++ openacs-4/packages/rss-support/sql/oracle/rss-generation-sc-create.sql 9 May 2003 22:40:04 -0000 1.1.2.2 @@ -22,7 +22,7 @@ foo := acs_sc_operation.new( contract_name => 'RssGenerationSubscriber', - operation_name => 'Datasource', + operation_name => 'datasource', operation_desc => 'Data Source', operation_iscachable_p => 'f', operation_nargs => 1, @@ -42,7 +42,7 @@ foo := acs_sc_operation.new( contract_name => 'RssGenerationSubscriber', - operation_name => 'LastUpdated', + operation_name => 'lastUpdated', operation_desc => 'Last Updated', operation_iscachable_p => 'f', operation_nargs => 1, @@ -52,4 +52,4 @@ end; / -show errors \ No newline at end of file +show errors Index: openacs-4/packages/rss-support/sql/oracle/upgrade/upgrade-0.2d1-0.2d2.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/sql/oracle/upgrade/upgrade-0.2d1-0.2d2.sql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/rss-support/sql/oracle/upgrade/upgrade-0.2d1-0.2d2.sql 9 May 2003 22:40:32 -0000 1.1.2.1 @@ -0,0 +1,32 @@ +-- +-- Upgrade script +-- +-- Change service contract operation names to use lowercase like the PosgreSQL version. +-- +-- $Id: upgrade-0.2d1-0.2d2.sql,v 1.1.2.1 2003/05/09 22:40:32 lars Exp $ +-- + +update acs_sc_operations +set operation_name = 'datasource' +where operation_name = 'Datasource' +and contract_name = 'RssGenerationSubscriber'; + + +update acs_sc_operations +set operation_name = 'lastUpdated' +where operation_name = 'LastUpdated' +and contract_name = 'RssGenerationSubscriber'; + + +update acs_sc_impl_aliases +set impl_operation_name = 'datasource' +where impl_operation_name = 'Datasource' +and impl_contract_name = 'RssGenerationSubscriber'; + + +update acs_sc_impl_aliases +set impl_operation_name = 'lastUpdated' +where impl_operation_name = 'LastUpdated' +and impl_contract_name = 'RssGenerationSubscriber'; + + Index: openacs-4/packages/rss-support/tcl/rss-generation-service-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/tcl/rss-generation-service-procs-oracle.xql,v diff -u -N -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/rss-support/tcl/rss-generation-service-procs-oracle.xql 30 Oct 2002 16:11:01 -0000 1.1.2.1 +++ openacs-4/packages/rss-support/tcl/rss-generation-service-procs-oracle.xql 9 May 2003 22:40:50 -0000 1.1.2.2 @@ -1,15 +1,60 @@ - - oracle - 8.1.6 - + oracle8.1.6 - + + select r.subscr_id, + r.timeout, + r.summary_context_id, + i.impl_name, + nvl2(r.lastbuild, date_part('epoch',r.lastbuild), 0) as lastbuild + from rss_gen_subscrs r, + acs_sc_impls i + where i.impl_id = r.impl_id + and (r.lastbuild is null + or sysdate > r.lastbuild + r.timeout/(60*60*24) + + + + + + update rss_gen_subscrs + set lastbuild = sysdate, + last_ttb = :last_ttb $extra_sql + where subscr_id = :subscr_id + + + + + select acs_sc_contract.get_id('RssGenerationSubscriber') from dual - \ No newline at end of file + + + + select impl_id + from acs_sc_impls i + where impl_contract_name = 'RssGenerationSubscriber' + and not exists (select 1 + from acs_sc_bindings b + where b.impl_id = i.impl_id + and b.contract_id = :contract_id) + + + + + + begin + acs_sc_binding.new( + contract_id => $contract_id, + impl_id => $impl_id + ); + end; + + + + Index: openacs-4/packages/rss-support/tcl/rss-generation-service-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/tcl/rss-generation-service-procs-postgresql.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/rss-support/tcl/rss-generation-service-procs-postgresql.xql 9 May 2003 22:40:50 -0000 1.1.2.1 @@ -0,0 +1,59 @@ + + + + postgresql7.1 + + + + select r.subscr_id, + r.timeout, + r.summary_context_id, + i.impl_name, + case when r.lastbuild = null + then 0 + else date_part('epoch',r.lastbuild) + end as lastbuild + from rss_gen_subscrs r, + acs_sc_impls i + where i.impl_id = r.impl_id + and (r.lastbuild is null + or now() - r.lastbuild > cast(r.timeout || ' seconds' as interval)) + + + + + + update rss_gen_subscrs + set lastbuild = now(), + last_ttb = :last_ttb $extra_sql + where subscr_id = :subscr_id + + + + + + + select acs_sc_contract__get_id('RssGenerationSubscriber') + + + + + + select impl_id + from acs_sc_impls i + where impl_contract_name = 'RssGenerationSubscriber' + and not exists (select 1 + from acs_sc_bindings b + where b.impl_id = i.impl_id + and b.contract_id = :contract_id) + + + + + + select acs_sc_binding__new($contract_id,$impl_id) + + + + + 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 -N -r1.10.2.3 -r1.10.2.4 --- openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl 13 Mar 2003 14:25:37 -0000 1.10.2.3 +++ openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl 9 May 2003 22:40:50 -0000 1.10.2.4 @@ -17,21 +17,7 @@ set n 0 - db_foreach timed_out_subscriptions { - select r.subscr_id, - r.timeout, - r.summary_context_id, - i.impl_name, - case when r.lastbuild = null - then 0 - else date_part('epoch',r.lastbuild) - end as lastbuild - from rss_gen_subscrs r, - acs_sc_impls i - where i.impl_id = r.impl_id - and (r.lastbuild is null - or now() - r.lastbuild > cast(r.timeout || ' seconds' as interval)) - } { + db_foreach timed_out_subscriptions {} { set lastupdate [acs_sc_call RssGenerationSubscriber lastUpdated \ $summary_context_id $impl_name] if { $lastupdate > $lastbuild } { @@ -50,14 +36,7 @@ } { set start [clock seconds] - db_1row subscr_info { - select i.impl_name, - r.summary_context_id - from acs_sc_impls i, - rss_gen_subscrs r - where r.subscr_id = :subscr_id - and i.impl_id = r.impl_id - } + db_1row subscr_info {} set datasource [acs_sc_call RssGenerationSubscriber datasource \ $summary_context_id $impl_name] @@ -94,12 +73,7 @@ } set last_ttb [expr [clock seconds] - $start] - db_dml update_timestamp " - update rss_gen_subscrs - set lastbuild = now(), - last_ttb = :last_ttb $extra_sql - where subscr_id = :subscr_id - " + db_dml update_timestamp {} } ad_proc -private rss_assert_dir path { @@ -121,27 +95,14 @@ ad_proc -private rss_gen_bind {} { Creates bindings for unbound implementations for RssGenerationSubscriber. } { - set contract_id [db_string get_contract_id { - select acs_sc_contract__get_id('RssGenerationSubscriber') - }] + set contract_id [db_string get_contract_id {}] - db_foreach get_unbound_impls { - select impl_id - from acs_sc_impls i - where impl_contract_name = 'RssGenerationSubscriber' - and not exists (select 1 - from acs_sc_bindings b - where b.impl_id = i.impl_id - and b.contract_id = :contract_id) - - } { + db_foreach get_unbound_impls {} { ns_log Notice "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 " - select acs_sc_binding__new($contract_id,$impl_id) - " + db_exec_plsql bind_impl {} } errMsg] { ns_log Notice "rss_gen_bind: error binding impl $impl_id for contract $contract_id: $errMsg" } @@ -163,14 +124,7 @@ 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 { - select s.summary_context_id, - i.impl_name - from rss_gen_subscrs s, - acs_sc_impls i - where i.impl_id = s.impl_id - and s.subscr_id = :subscr_id - } + db_1row subscr_context_and_impl {} } } @@ -193,22 +147,14 @@ or impl_name + summary_context_id provided. If the -assert flag is set, the parent directory is created if it doesn't exist - If the -url flag is set, return a url; otherwise - 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 { - select s.summary_context_id, - i.impl_name - from rss_gen_subscrs s, - acs_sc_impls i - where i.impl_id = s.impl_id - and s.subscr_id = :subscr_id - } + db_1row subscr_context_and_impl {} } } Index: openacs-4/packages/rss-support/tcl/rss-generation-service-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/tcl/rss-generation-service-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/rss-support/tcl/rss-generation-service-procs.xql 9 May 2003 22:40:50 -0000 1.1.2.1 @@ -0,0 +1,40 @@ + + + + + + + select i.impl_name, + r.summary_context_id + from acs_sc_impls i, + rss_gen_subscrs r + where r.subscr_id = :subscr_id + and i.impl_id = r.impl_id + + + + + + select s.summary_context_id, + i.impl_name + from rss_gen_subscrs s, + acs_sc_impls i + where i.impl_id = s.impl_id + and s.subscr_id = :subscr_id + + + + + + + select s.summary_context_id, + i.impl_name + from rss_gen_subscrs s, + acs_sc_impls i + where i.impl_id = s.impl_id + and s.subscr_id = :subscr_id + + + + + Index: openacs-4/packages/rss-support/tcl/rss-utilities-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/tcl/rss-utilities-procs-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/rss-support/tcl/rss-utilities-procs-oracle.xql 9 May 2003 22:40:50 -0000 1.1.2.1 @@ -0,0 +1,12 @@ + + + + oracle8.1.6 + + + + select site_node.url(node_id) from site_nodes where object_id = :package_id + + + + Index: openacs-4/packages/rss-support/tcl/rss-utilities-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/tcl/rss-utilities-procs-postgresql.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/rss-support/tcl/rss-utilities-procs-postgresql.xql 9 May 2003 22:40:50 -0000 1.1.2.1 @@ -0,0 +1,12 @@ + + + + postgresql7.1 + + + + select site_node__url(node_id) from site_nodes where object_id = :package_id + + + + Index: openacs-4/packages/rss-support/tcl/rss-utilities-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/tcl/rss-utilities-procs.tcl,v diff -u -N -r1.3 -r1.3.2.1 --- openacs-4/packages/rss-support/tcl/rss-utilities-procs.tcl 12 Sep 2002 22:44:31 -0000 1.3 +++ openacs-4/packages/rss-support/tcl/rss-utilities-procs.tcl 9 May 2003 22:40:50 -0000 1.3.2.1 @@ -16,7 +16,7 @@ # Returns 0 otherwise. } { - if ![db_0or1row get_package_id {select package_id from apm_packages where package_key = 'rss-support'}] { + if ![db_0or1row get_package_id {}] { return 0 } else { return $package_id @@ -30,7 +30,7 @@ } { set package_id [rss_package_id] - return [db_string rss_url {select site_node__url(node_id) from site_nodes where object_id = :package_id} -default ""] + return [db_string rss_url {} -default ""] } @@ -52,19 +52,9 @@ } { set url "" - if [db_0or1row first_node_id { - select node_id from site_nodes - where object_id = :package_id - order by node_id limit 1 - }] { - db_foreach url_parts { - select s2.name - from site_nodes s1, site_nodes s2 - where s1.node_id = :node_id - and s1.tree_sortkey between s2.tree_sortkey and tree_right(s2.tree_sortkey) - order by s2.tree_sortkey; - } { - append url ${name}/ + if [db_0or1row first_node_id {}] { + db_foreach url_parts {} { + append url ${name} } } Index: openacs-4/packages/rss-support/tcl/rss-utilities-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/tcl/rss-utilities-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/rss-support/tcl/rss-utilities-procs.xql 9 May 2003 22:40:50 -0000 1.1.2.1 @@ -0,0 +1,19 @@ + + + + + + + select package_id from apm_packages where package_key = 'rss-support' + + + + + + select node_id from site_nodes + where object_id = :package_id + order by node_id limit 1 + + + + Index: openacs-4/packages/rss-support/www/delete-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/delete-2-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/rss-support/www/delete-2-oracle.xql 9 May 2003 22:41:07 -0000 1.1.2.1 @@ -0,0 +1,14 @@ + + + + oracle8.1.6 + + + + begin + :1 := rss_gen_subscr.delete (:subscr_id); + end; + + + + Index: openacs-4/packages/rss-support/www/delete-2-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/delete-2-postgresql.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/rss-support/www/delete-2-postgresql.xql 9 May 2003 22:41:07 -0000 1.1.2.1 @@ -0,0 +1,14 @@ + + + + postgresql7.1 + + + + select rss_gen_subscr__delete ( + :subscr_id + ) + + + + Index: openacs-4/packages/rss-support/www/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/delete-2.tcl,v diff -u -N -r1.1 -r1.1.4.1 --- openacs-4/packages/rss-support/www/delete-2.tcl 12 Dec 2001 02:58:23 -0000 1.1 +++ openacs-4/packages/rss-support/www/delete-2.tcl 9 May 2003 22:41:07 -0000 1.1.4.1 @@ -12,10 +12,6 @@ ns_unlink -nocomplain [rss_gen_report_file -subscr_id $subscr_id] } -db_exec_plsql delete_subscr { - select rss_gen_subscr__delete ( - :subscr_id - ) -} +db_exec_plsql delete_subscr {} ad_returnredirect $return_url Index: openacs-4/packages/rss-support/www/delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/delete.adp,v diff -u -N -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/rss-support/www/delete.adp 6 Oct 2002 06:29:32 -0000 1.3.2.1 +++ openacs-4/packages/rss-support/www/delete.adp 9 May 2003 22:41:07 -0000 1.3.2.2 @@ -8,7 +8,7 @@ -Delete report (@report_url@) +

Index: openacs-4/packages/rss-support/www/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/delete.tcl,v diff -u -N -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/rss-support/www/delete.tcl 13 Mar 2003 14:26:09 -0000 1.3.2.1 +++ openacs-4/packages/rss-support/www/delete.tcl 9 May 2003 22:41:07 -0000 1.3.2.2 @@ -7,13 +7,7 @@ ad_require_permission $subscr_id admin -db_1row subscr_info { - select summary_context_id, - channel_title, - channel_link - from rss_gen_subscrs - where subscr_id = :subscr_id -} +db_1row subscr_info {} if [string equal $channel_title ""] { set channel_title "Summary Context $summary_context_id" @@ -23,7 +17,7 @@ if [file exists [rss_gen_report_file -subscr_id $subscr_id]] { set offer_file 1 - set report_url [rss_gen_report_file -subscr_id $subscr_id -url] + set report_url [rss_gen_report_file -subscr_id $subscr_id] } else { set offer_file 0 -} \ No newline at end of file +} Index: openacs-4/packages/rss-support/www/delete.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/delete.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/rss-support/www/delete.xql 9 May 2003 22:41:07 -0000 1.1.2.1 @@ -0,0 +1,15 @@ + + + + + + + select summary_context_id, + channel_title, + channel_link + from rss_gen_subscrs + where subscr_id = :subscr_id + + + + Index: openacs-4/packages/rss-support/www/subscr-ae-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae-2-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/rss-support/www/subscr-ae-2-oracle.xql 9 May 2003 22:41:07 -0000 1.1.2.1 @@ -0,0 +1,27 @@ + + + + oracle8.1.6 + + + + begin + :1 := rss_gen_subscr.new ( + :subscr_id, -- subscr_id + :impl_id, -- impl_id + :summary_context_id, -- summary_context_id + :timeout, -- timeout + null, -- lastbuild + 'rss_gen_subscr', -- object_type + sysdate, -- creation_date + :creation_user, -- creation_user + :creation_ip, -- creation_ip + :summary_context_id -- context_id + ); + end + + + + + + Index: openacs-4/packages/rss-support/www/subscr-ae-2-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae-2-postgresql.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/rss-support/www/subscr-ae-2-postgresql.xql 9 May 2003 22:41:07 -0000 1.1.2.1 @@ -0,0 +1,24 @@ + + + + postgresql7.1 + + + + select rss_gen_subscr__new ( + :subscr_id, -- subscr_id + :impl_id, -- impl_id + :summary_context_id, -- summary_context_id + :timeout, -- timeout + null, -- lastbuild + 'rss_gen_subscr', -- object_type + now(), -- creation_date + :creation_user, -- creation_user + :creation_ip, -- creation_ip + :summary_context_id -- context_id + ) + + + + + Index: openacs-4/packages/rss-support/www/subscr-ae-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae-2.tcl,v diff -u -N -r1.3 -r1.3.2.1 --- openacs-4/packages/rss-support/www/subscr-ae-2.tcl 5 Sep 2002 13:23:33 -0000 1.3 +++ openacs-4/packages/rss-support/www/subscr-ae-2.tcl 9 May 2003 22:41:07 -0000 1.3.2.1 @@ -23,34 +23,18 @@ }] { # Subscription exists ad_require_permission $subscr_id admin - db_dml update_subscr { - update rss_gen_subscrs - set timeout = :timeout - where subscr_id = :subscr_id - } + db_dml update_subscr {} } else { # Create a new subscription. ad_require_permission $summary_context_id admin set creation_user [ad_conn user_id] set creation_ip [ns_conn peeraddr] - db_exec_plsql create_subscr { - select rss_gen_subscr__new ( - :subscr_id, -- subscr_id - :impl_id, -- impl_id - :summary_context_id, -- summary_context_id - :timeout, -- timeout - null, -- lastbuild - 'rss_gen_subscr', -- object_type - now(), -- creation_date - :creation_user, -- creation_user - :creation_ip, -- creation_ip - :summary_context_id -- context_id - ) - } + set subscr_id [db_exec_plsql create_subscr {}] } -set context [list] +set review_url subscr-ae?[export_url_vars subscr_id impl_id summary_context_id return_url meta] -set review_url subscr-ae?[export_url_vars impl_id summary_context_id return_url meta] \ No newline at end of file +set context [list [list $review_url "Edit subscription"] "Done"] + Index: openacs-4/packages/rss-support/www/subscr-ae-2.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae-2.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/rss-support/www/subscr-ae-2.xql 9 May 2003 22:41:07 -0000 1.1.2.1 @@ -0,0 +1,13 @@ + + + + + + + update rss_gen_subscrs + set timeout = :timeout + where subscr_id = :subscr_id + + + + Index: openacs-4/packages/rss-support/www/subscr-ae-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/rss-support/www/subscr-ae-oracle.xql 9 May 2003 22:41:07 -0000 1.1.2.1 @@ -0,0 +1,14 @@ + + + + oracle8.1.6 + + + + select acs_sc_impl.get_name(impl_id) as impl_name + from acs_sc_impls + where impl_id = :impl_id + + + + Index: openacs-4/packages/rss-support/www/subscr-ae-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae-postgresql.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/rss-support/www/subscr-ae-postgresql.xql 9 May 2003 22:41:07 -0000 1.1.2.1 @@ -0,0 +1,14 @@ + + + + postgresql7.1 + + + + select acs_sc_impl__get_name(impl_id) as impl_name + from acs_sc_impls + where impl_id = :impl_id + + + + Index: openacs-4/packages/rss-support/www/subscr-ae.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae.adp,v diff -u -N -r1.4.2.1 -r1.4.2.2 --- openacs-4/packages/rss-support/www/subscr-ae.adp 6 Oct 2002 06:29:32 -0000 1.4.2.1 +++ openacs-4/packages/rss-support/www/subscr-ae.adp 9 May 2003 22:41:07 -0000 1.4.2.2 @@ -5,7 +5,7 @@

- Index: openacs-4/packages/rss-support/www/subscr-ae.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae.tcl,v diff -u -N -r1.6 -r1.6.2.1 --- openacs-4/packages/rss-support/www/subscr-ae.tcl 5 Sep 2002 13:23:33 -0000 1.6 +++ openacs-4/packages/rss-support/www/subscr-ae.tcl 9 May 2003 22:41:07 -0000 1.6.2.1 @@ -31,27 +31,14 @@ } if { [info exists impl_id] && [info exists summary_context_id] } { - db_0or1row subscr_id_from_impl_and_context { - select subscr_id - from rss_gen_subscrs - where impl_id = :impl_id - and summary_context_id = :summary_context_id - } + db_0or1row subscr_id_from_impl_and_context {} } if [info exists subscr_id] { set action edit set pretty_action Edit ad_require_permission $subscr_id admin - db_1row subscr_info { - select impl_id, - summary_context_id, - timeout, - channel_title, - channel_link - from rss_gen_subscrs - where subscr_id = :subscr_id - } + db_1row subscr_info {} } else { set action add set pretty_action Add @@ -61,11 +48,7 @@ } # Validate the impl_id and get its name -if ![db_0or1row get_impl_name_and_count { - select acs_sc_impl__get_name(impl_id) as impl_name - from acs_sc_impls - where impl_id = :impl_id -}] { +if ![db_0or1row get_impl_name_and_count {}] { ad_return_error "No implementation found for this id." "We were unable to process your request. Please contact this site's technical team for assistance." Index: openacs-4/packages/rss-support/www/subscr-ae.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/rss-support/www/subscr-ae.xql 9 May 2003 22:41:07 -0000 1.1.2.1 @@ -0,0 +1,26 @@ + + + + + + + select subscr_id + from rss_gen_subscrs + where impl_id = :impl_id + and summary_context_id = :summary_context_id + + + + + + select impl_id, + summary_context_id, + timeout, + channel_title, + channel_link + from rss_gen_subscrs + where subscr_id = :subscr_id + + + + Index: openacs-4/packages/rss-support/www/subscr-run.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-run.tcl,v diff -u -N -r1.1 -r1.1.4.1 --- openacs-4/packages/rss-support/www/subscr-run.tcl 30 Nov 2001 05:56:37 -0000 1.1 +++ openacs-4/packages/rss-support/www/subscr-run.tcl 9 May 2003 22:41:07 -0000 1.1.4.1 @@ -9,4 +9,4 @@ rss_gen_report $subscr_id -ad_returnredirect $return_url \ No newline at end of file +ad_returnredirect $return_url Index: openacs-4/packages/rss-support/www/subscrs-include-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/Attic/subscrs-include-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/rss-support/www/subscrs-include-oracle.xql 9 May 2003 22:41:07 -0000 1.1.2.1 @@ -0,0 +1,22 @@ + + + + oracle8.1.6 + + + + select s.subscr_id, + s.timeout, + person.name(o.creation_user) as creator, + nvl(to_char(s.lastbuild,'YYYY-MM-DD HH24:MI:SS'),'never built') as lastbuild, + s.last_ttb, + s.channel_title, + s.channel_link + from rss_gen_subscrs s, + acs_objects o + where o.object_id = s.subscr_id $maybe_restrict_to_user + order by s.last_ttb desc + + + + Index: openacs-4/packages/rss-support/www/subscrs-include-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/Attic/subscrs-include-postgresql.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/rss-support/www/subscrs-include-postgresql.xql 9 May 2003 22:41:07 -0000 1.1.2.1 @@ -0,0 +1,22 @@ + + + + postgresql7.1 + + + + select s.subscr_id, + s.timeout, + person__name(o.creation_user) as creator, + coalesce(to_char(s.lastbuild,'YYYY-MM-DD HH24:MI:SS'),'never built') as lastbuild, + s.last_ttb, + s.channel_title, + s.channel_link + from rss_gen_subscrs s, + acs_objects o + where o.object_id = s.subscr_id $maybe_restrict_to_user + order by s.last_ttb desc + + + + Index: openacs-4/packages/rss-support/www/subscrs-include.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscrs-include.tcl,v diff -u -N -r1.1 -r1.1.4.1 --- openacs-4/packages/rss-support/www/subscrs-include.tcl 12 Dec 2001 02:58:23 -0000 1.1 +++ openacs-4/packages/rss-support/www/subscrs-include.tcl 9 May 2003 22:41:07 -0000 1.1.4.1 @@ -4,19 +4,7 @@ set maybe_restrict_to_user "" } -db_multirow subscrs get_subscrs " - select s.subscr_id, - s.timeout, - person__name(o.creation_user) as creator, - coalesce(to_char(s.lastbuild,'YYYY-MM-DD HH24:MI:SS'),'never built') as lastbuild, - s.last_ttb, - s.channel_title, - s.channel_link - from rss_gen_subscrs s, - acs_objects o - where o.object_id = s.subscr_id $maybe_restrict_to_user - order by s.last_ttb desc -" { +db_multirow subscrs get_subscrs {} { if [string equal $channel_title ""] { set channel_title "Subscription #$subscr_id" }
Channel:@channel_title@ +@channel_title@ @channel_title@
Impl Name: @impl_name@