Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/jobs-kill.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/contrib/obsolete-packages/acs-workflow/sql/oracle/jobs-start.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/contrib/obsolete-packages/acs-workflow/sql/postgresql/workflow-case-package-body.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/sql/postgresql/workflow-case-package-body.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/obsolete-packages/acs-workflow/sql/postgresql/workflow-case-package-body.sql 19 Nov 2001 18:20:33 -0000 1.1 +++ openacs-4/contrib/obsolete-packages/acs-workflow/sql/postgresql/workflow-case-package-body.sql 24 Dec 2001 02:50:17 -0000 1.2 @@ -1449,10 +1449,9 @@ end;' language 'plpgsql'; +-- The next two functions are called periodically by a scheduled Tcl script. - - /* This procedure should be scheduled to run as a dbms_job. */ -create function sweep_timed_transitions () returns integer as ' +create function workflow_case__sweep_timed_transitions () returns integer as ' declare v_journal_id integer; trans_rec record; @@ -1498,8 +1497,7 @@ end;' language 'plpgsql'; - /* This procedure should be scheduled to run as a dbms_job. */ -create function sweep_hold_timeout () returns integer as ' +create function workflow_case__sweep_hold_timeout () returns integer as ' declare v_journal_id integer; task_rec record; @@ -1535,7 +1533,7 @@ end loop; - returns 0; + return 0; end;' language 'plpgsql'; -- procedure notify_assignee Index: openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs-oracle.xql,v diff -u -r1.5 -r1.6 --- openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs-oracle.xql 19 Nov 2001 18:25:09 -0000 1.5 +++ openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs-oracle.xql 24 Dec 2001 02:50:17 -0000 1.6 @@ -838,6 +838,22 @@ + + + begin + workflow_case.sweep_timed_transitions; + end; + + + + + + begin + workflow_case.sweep_hold_timeout; + end; + + + Index: openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs-postgresql.xql,v diff -u -r1.7 -r1.8 --- openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs-postgresql.xql 19 Nov 2001 18:25:09 -0000 1.7 +++ openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs-postgresql.xql 24 Dec 2001 02:50:17 -0000 1.8 @@ -758,19 +758,17 @@ + + + select workflow_case__sweep_timed_transitions(); + + - + + + select workflow_case__sweep_hold_timeout(); + + - - - - - - - - - - - - + Index: openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs.tcl 19 Nov 2001 22:10:36 -0000 1.6 +++ openacs-4/contrib/obsolete-packages/acs-workflow/tcl/workflow-procs.tcl 24 Dec 2001 02:50:17 -0000 1.7 @@ -1738,3 +1738,20 @@ } return $arg_spec } + +ad_proc wf_sweep_time_events {} { + Sweep timed transitions and hold timeouts. This was originally done with Oracle + but has been pulled out here so it will work with any RDBMS. + + @author Don Baccus (dhogaza@pacifier.com) +} { + + ns_log Notice "workflow-case: sweeping timed transitions" + db_exec_plsql sweep_timed_transitions "" + + ns_log Notice "workflow-case: sweeping hold timeout" + db_exec_plsql sweep_hold_timeout "" +} + +ad_schedule_proc -thread t 900 wf_sweep_time_events + Index: openacs-4/packages/cms/tcl/workflow-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/workflow-procs.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/cms/tcl/workflow-procs.tcl 19 Nov 2001 21:07:08 -0000 1.8 +++ openacs-4/packages/cms/tcl/workflow-procs.tcl 24 Dec 2001 02:50:17 -0000 1.9 @@ -267,37 +267,3 @@ return f } } - -ad_proc -private workflow::mail_notifications {} { - - @private mail_notifications - - Schedules procedure for mailing notifications - - @author Michael Pih - -} { - ns_log Notice "Running Scheduled Notifications Proc" - - set mail_server [template::util::get_param mail_server "ns/server/[ns_info server]/cms" OutgoingMailServer] - set mail_port [template::util::get_param mail_port "ns/server/[ns_info server]/cms" MailPort] - - # if there's no mail server, don't run scheduled processes - if { [template::util::is_nil mail_server] } { - return - } - - # default mail port, if none is set - if { [template::util::is_nil mail_port] } { - set mail_port 25 - } - db_transaction { - db_exec_plsql process_queue " - begin - nt.process_queue( :mail_server, :mail_port ); - end; - " - } -} - -ns_schedule_proc -thread 300 workflow::mail_notifications Index: openacs-4/packages/cronjob/tcl/cronjob-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/tcl/cronjob-init.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/cronjob/tcl/cronjob-init.tcl 4 Nov 2001 18:07:54 -0000 1.1 +++ openacs-4/packages/cronjob/tcl/cronjob-init.tcl 24 Dec 2001 02:50:17 -0000 1.2 @@ -8,7 +8,7 @@ } -ns_schedule_proc -thread 60 cronjob_check +ad_schedule_proc -thread t 60 cronjob_check if {![info exists qd_write_query_select]} { Index: openacs-4/packages/cronjob/tcl/cronjob-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/tcl/cronjob-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/cronjob/tcl/cronjob-procs.tcl 4 Nov 2001 18:07:54 -0000 1.1 +++ openacs-4/packages/cronjob/tcl/cronjob-procs.tcl 24 Dec 2001 02:50:17 -0000 1.2 @@ -29,7 +29,7 @@ db_foreach cronjob_sched_foreach $sql { - ns_schedule_proc -once -thread 1 cronjob_run $cronjob_id + ad_schedule_proc -once t -thread t 1 cronjob_run $cronjob_id } } Index: openacs-4/packages/cronjob/www/admin/cronjob-run-now.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob-run-now.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/cronjob/www/admin/cronjob-run-now.tcl 4 Nov 2001 18:09:49 -0000 1.1 +++ openacs-4/packages/cronjob/www/admin/cronjob-run-now.tcl 24 Dec 2001 02:50:17 -0000 1.2 @@ -10,6 +10,6 @@ } -ns_schedule_proc -once -thread 1 cronjob_run $cronjob_id +ad_schedule_proc -once t -thread t 1 cronjob_run $cronjob_id -ad_returnredirect cronjobs \ No newline at end of file +ad_returnredirect cronjobs