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 @@

- 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.7 --- 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 17 May 2003 11:23:29 -0000 1.7 @@ -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 17 May 2003 11:23:29 -0000 1.2 @@ -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.2 --- 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 17 May 2003 11:23:29 -0000 1.2 @@ -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 17 May 2003 11:23:29 -0000 1.2 @@ -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 17 May 2003 11:23:29 -0000 1.2 @@ -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.2 --- 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 17 May 2003 11:23:29 -0000 1.2 @@ -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" } Index: openacs-4/packages/schema-browser/schema-browser.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/schema-browser/schema-browser.info,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/schema-browser/schema-browser.info 16 Jan 2003 13:56:12 -0000 1.4 +++ openacs-4/packages/schema-browser/schema-browser.info 17 May 2003 11:24:18 -0000 1.5 @@ -18,7 +18,7 @@ 2001-01-24ArsDigita Corporation - + Index: openacs-4/packages/schema-browser/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/schema-browser/www/index.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/schema-browser/www/index.tcl 10 Sep 2002 22:23:21 -0000 1.2 +++ openacs-4/packages/schema-browser/www/index.tcl 17 May 2003 11:25:11 -0000 1.3 @@ -41,7 +41,7 @@ " if { [exists_and_not_null table_name] } { - append page_content [util_memoize "sb_get_table_description $table_name"] + append page_content [sb_get_table_description $table_name] } else { set table_name "" } Index: openacs-4/packages/search/search.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/search.info,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/search/search.info 30 Nov 2002 17:45:10 -0000 1.7 +++ openacs-4/packages/search/search.info 17 May 2003 11:26:35 -0000 1.8 @@ -18,43 +18,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: openacs-4/packages/search/sql/postgresql/search-packages-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/sql/postgresql/search-packages-create.sql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/search/sql/postgresql/search-packages-create.sql 21 Dec 2002 22:27:28 -0000 1.4 +++ openacs-4/packages/search/sql/postgresql/search-packages-create.sql 17 May 2003 11:27:28 -0000 1.5 @@ -21,7 +21,7 @@ end;' language 'plpgsql'; -create function search_observer__dequeue(integer,timestamp with time zone,varchar) +create function search_observer__dequeue(integer,timestamptz,varchar) returns integer as ' declare p_object_id alias for $1; Index: openacs-4/packages/search/sql/postgresql/search-packages-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/sql/postgresql/search-packages-drop.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/search/sql/postgresql/search-packages-drop.sql 2 Sep 2001 18:11:39 -0000 1.1 +++ openacs-4/packages/search/sql/postgresql/search-packages-drop.sql 17 May 2003 11:27:28 -0000 1.2 @@ -1,2 +1,2 @@ -drop function search_observer__dequeue(integer,timestamp,varchar); +drop function search_observer__dequeue(integer,timestamptz,varchar); drop function search_observer__enqueue(integer,varchar); Index: openacs-4/packages/search/sql/postgresql/search-tables-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/sql/postgresql/search-tables-create.sql,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/search/sql/postgresql/search-tables-create.sql 2 Jul 2002 01:52:39 -0000 1.5 +++ openacs-4/packages/search/sql/postgresql/search-tables-create.sql 17 May 2003 11:27:28 -0000 1.6 @@ -1,6 +1,6 @@ create table search_observer_queue ( object_id integer, - event_date timestamp default now(), + event_date timestamptz default current_timestamp, event varchar(6) constraint search_observer_queue_event_ck check (event in ('INSERT','DELETE','UPDATE')) Index: openacs-4/packages/search/tcl/search-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/tcl/search-procs.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/search/tcl/search-procs.xql 30 Nov 2002 17:46:41 -0000 1.3 +++ openacs-4/packages/search/tcl/search-procs.xql 17 May 2003 11:29:41 -0000 1.4 @@ -18,7 +18,7 @@ - + select :content as content, 'lob' as storage_type Index: openacs-4/packages/simple-survey/simple-survey.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/simple-survey.info,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/simple-survey/simple-survey.info 16 Jan 2003 13:56:37 -0000 1.9 +++ openacs-4/packages/simple-survey/simple-survey.info 17 May 2003 11:30:38 -0000 1.10 @@ -18,7 +18,7 @@ ArsDigita Corporation Simple survey is a survey builder. Surveys can contain questions with different types of answer several types: multiple choice (radio buttons), multiple answer (checkboxes) or free text entry. Multiple choice questions may also be scored on one or more variables. - + Index: openacs-4/packages/simple-survey/sql/postgresql/simple-survey-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/sql/postgresql/simple-survey-create.sql,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/simple-survey/sql/postgresql/simple-survey-create.sql 23 Feb 2003 18:22:40 -0000 1.6 +++ openacs-4/packages/simple-survey/sql/postgresql/simple-survey-create.sql 17 May 2003 11:31:27 -0000 1.7 @@ -308,7 +308,7 @@ clob_answer text, number_answer numeric, varchar_answer text, - date_answer timestamp, + date_answer timestamptz, -- columns useful for attachments, column names -- lifted from file-storage.sql and bboard.sql -- this is where the actual content is stored Index: openacs-4/packages/site-wide-search/site-wide-search.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/site-wide-search/site-wide-search.info,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/site-wide-search/site-wide-search.info 16 Jan 2003 13:57:16 -0000 1.3 +++ openacs-4/packages/site-wide-search/site-wide-search.info 17 May 2003 11:32:49 -0000 1.4 @@ -19,7 +19,7 @@ - +
Channel:@channel_title@ +@channel_title@ @channel_title@
Impl Name: @impl_name@