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 17 May 2003 11:23:28 -0000 1.2
@@ -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 17 May 2003 11:23:29 -0000 1.2
@@ -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.2
--- 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 17 May 2003 11:23:29 -0000 1.2
@@ -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.4 -r1.5
--- openacs-4/packages/rss-support/www/delete.adp 30 Nov 2002 17:44:39 -0000 1.4
+++ openacs-4/packages/rss-support/www/delete.adp 17 May 2003 11:23:29 -0000 1.5
@@ -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.4 -r1.5
--- openacs-4/packages/rss-support/www/delete.tcl 30 Jan 2003 16:52:12 -0000 1.4
+++ openacs-4/packages/rss-support/www/delete.tcl 17 May 2003 11:23:29 -0000 1.5
@@ -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 17 May 2003 11:23:29 -0000 1.2
@@ -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 17 May 2003 11:23:29 -0000 1.2
@@ -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 17 May 2003 11:23:29 -0000 1.2
@@ -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.4
--- 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 17 May 2003 11:23:29 -0000 1.4
@@ -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 17 May 2003 11:23:29 -0000 1.2
@@ -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 17 May 2003 11:23:29 -0000 1.2
@@ -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 17 May 2003 11:23:29 -0000 1.2
@@ -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.5 -r1.6
--- openacs-4/packages/rss-support/www/subscr-ae.adp 30 Nov 2002 17:44:39 -0000 1.5
+++ openacs-4/packages/rss-support/www/subscr-ae.adp 17 May 2003 11:23:29 -0000 1.6
@@ -5,7 +5,7 @@