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 -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
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/rss-support/sql/oracle/upgrade/upgrade-0.2d1-0.2d2.sql'.
Fisheye: No comparison available. Pass `N' to diff?
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 -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;
+
+
+
+
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/rss-support/tcl/rss-generation-service-procs-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
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.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 {}
}
}
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/rss-support/tcl/rss-generation-service-procs.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/rss-support/tcl/rss-utilities-procs-oracle.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/rss-support/tcl/rss-utilities-procs-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
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 -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}
}
}
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/rss-support/tcl/rss-utilities-procs.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/rss-support/www/delete-2-oracle.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/rss-support/www/delete-2-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
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 -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 -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 -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
+}
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/rss-support/www/delete.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/rss-support/www/subscr-ae-2-oracle.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/rss-support/www/subscr-ae-2-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
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 -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"]
+
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/rss-support/www/subscr-ae-2.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/rss-support/www/subscr-ae-oracle.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/rss-support/www/subscr-ae-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
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 -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 @@