Index: openacs-4/packages/cronjob/cronjob.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/cronjob.info,v diff -u -N -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/cronjob/cronjob.info 9 Oct 2002 00:26:21 -0000 1.3.2.1 +++ openacs-4/packages/cronjob/cronjob.info 9 Oct 2002 05:04:09 -0000 1.3.2.2 @@ -46,6 +46,7 @@ + Index: openacs-4/packages/cronjob/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/index.tcl,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/cronjob/www/index.tcl 4 Sep 2002 09:06:09 -0000 1.1 +++ openacs-4/packages/cronjob/www/index.tcl 9 Oct 2002 05:04:09 -0000 1.1.2.1 @@ -3,7 +3,8 @@ A place holder for access to the admin pages. @author Bart Teeuwisse - @creation-date April 2002 + @cvs-id $Id$ + @creation-date Oct 2002 } { } -properties { @@ -22,15 +23,10 @@ # Get the name of the package -if {[db_0or1row get_package_name " - select p.instance_name - from apm_packages p, apm_package_versions v - where p.package_id = :package_id - and p.package_key = v.package_key - and v.enabled_p = 't'"]} { +if {[db_0or1row get_package_name ""]} { set title "$instance_name" } else { - set title "Authorize.net Gateway" + set title "Cronjob" } # Set the context bar. Index: openacs-4/packages/cronjob/www/index.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/index.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/cronjob/www/index.xql 9 Oct 2002 05:04:09 -0000 1.1.2.1 @@ -0,0 +1,15 @@ + + + + + + + select p.instance_name + from apm_packages p, apm_package_versions v + where p.package_id = :package_id + and p.package_key = v.package_key + and v.enabled_p = 't' + + + + Index: openacs-4/packages/cronjob/www/admin/cronjob-add-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob-add-oracle.xql,v diff -u -N -r1.1 -r1.1.4.1 --- openacs-4/packages/cronjob/www/admin/cronjob-add-oracle.xql 4 Nov 2001 18:09:49 -0000 1.1 +++ openacs-4/packages/cronjob/www/admin/cronjob-add-oracle.xql 9 Oct 2002 05:04:09 -0000 1.1.4.1 @@ -1,33 +1,27 @@ - oracle8.1.6 + oracle8.1.6 - - - - - declare - v_cronjob_id integer; - begin - v_cronjob_id := cronjob.new( - user_id => :user_id, - description => :description, - approved_p => :approved_p, - disabled_p => :disabled_p, - minute => :minute, - hr => :hr, - mon => :mon, - day => :day, - dayofweek => :dayofweek, - run_sql => :run_sql, - run_tcl => :run_tcl, - email => :email - ); - end; - - - - - + + + declare v_cronjob_id integer; + begin + v_cronjob_id := cronjob.new( + user_id => :user_id, + description => :description, + approved_p => :approved_p, + disabled_p => :disabled_p, + minute => :minute, + hr => :hr, + mon => :mon, + day => :day, + dayofweek => :dayofweek, + run_sql => :run_sql, + run_tcl => :run_tcl, + email => :email); + end; + + + Index: openacs-4/packages/cronjob/www/admin/cronjob-add-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob-add-postgresql.xql,v diff -u -N -r1.1 -r1.1.4.1 --- openacs-4/packages/cronjob/www/admin/cronjob-add-postgresql.xql 4 Nov 2001 18:09:49 -0000 1.1 +++ openacs-4/packages/cronjob/www/admin/cronjob-add-postgresql.xql 9 Oct 2002 05:04:09 -0000 1.1.4.1 @@ -1,10 +1,10 @@ - postgresql7.1 + postgresql7.1 - - + + select [qd_write_query_select cronjob__new { user_id => :user_id description => :description @@ -19,8 +19,7 @@ run_tcl => :run_tcl email => :email } ] - - - + + Index: openacs-4/packages/cronjob/www/admin/cronjob-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob-add.tcl,v diff -u -N -r1.2 -r1.2.2.1 --- openacs-4/packages/cronjob/www/admin/cronjob-add.tcl 10 Sep 2002 22:22:33 -0000 1.2 +++ openacs-4/packages/cronjob/www/admin/cronjob-add.tcl 9 Oct 2002 05:04:09 -0000 1.2.2.1 @@ -1,14 +1,14 @@ ad_page_contract { - + Cronjobs Add Page 2 - @author: tom@zmbh.com - @creation-date: 22 Sept 2001 - @cvs-id $Id$ + @author tom@zmbh.com + @creation-date 22 Sept 2001 + @cvs-id $Id$ } { - description:trim,notnull,html - minute:notnull,trim + description:trim,notnull,html + minute:notnull,trim hr:notnull,trim mon:notnull,trim day:notnull,trim @@ -26,25 +26,25 @@ db_exec_plsql add_cronjob { - - declare - v_cronjob_id integer; - begin + + declare + v_cronjob_id integer; + begin v_cronjob_id := cronjob.new( - user_id => :user_id, - description => :description, - approved_p => :approved_p, - disabled_p => :disabled_p, - minute => :minute, - hr => :hr, - mon => :mon, - day => :day, - dayofweek => :dayofweek, - run_sql => :run_sql, - run_tcl => :run_tcl, - email => :email - ); - end; + user_id => :user_id, + description => :description, + approved_p => :approved_p, + disabled_p => :disabled_p, + minute => :minute, + hr => :hr, + mon => :mon, + day => :day, + dayofweek => :dayofweek, + run_sql => :run_sql, + run_tcl => :run_tcl, + email => :email + ); + end; } -ad_returnredirect cronjobs \ No newline at end of file +ad_returnredirect cronjobs Index: openacs-4/packages/cronjob/www/admin/cronjob-delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob-delete-oracle.xql,v diff -u -N -r1.1 -r1.1.4.1 --- openacs-4/packages/cronjob/www/admin/cronjob-delete-oracle.xql 4 Nov 2001 18:09:49 -0000 1.1 +++ openacs-4/packages/cronjob/www/admin/cronjob-delete-oracle.xql 9 Oct 2002 05:04:09 -0000 1.1.4.1 @@ -1,20 +1,14 @@ - oracle8.1.6 + oracle8.1.6 - - - - - begin - cronjob.delete( - cronjob_id => :cronjob_id - ); - end; + + + begin + cronjob.delete(cronjob_id => :cronjob_id); + end; + + - - - - Index: openacs-4/packages/cronjob/www/admin/cronjob-delete-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob-delete-postgresql.xql,v diff -u -N -r1.1 -r1.1.4.1 --- openacs-4/packages/cronjob/www/admin/cronjob-delete-postgresql.xql 4 Nov 2001 18:09:49 -0000 1.1 +++ openacs-4/packages/cronjob/www/admin/cronjob-delete-postgresql.xql 9 Oct 2002 05:04:09 -0000 1.1.4.1 @@ -1,16 +1,14 @@ - postgresql7.1 + postgresql7.1 - - - - select [qd_write_query_select cronjob__delete { + + + select [qd_write_query_select cronjob__delete { cronjob_id => :cronjob_id } ] + + - - - - + Index: openacs-4/packages/cronjob/www/admin/cronjob-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob-delete.tcl,v diff -u -N -r1.2 -r1.2.2.1 --- openacs-4/packages/cronjob/www/admin/cronjob-delete.tcl 10 Sep 2002 22:22:33 -0000 1.2 +++ openacs-4/packages/cronjob/www/admin/cronjob-delete.tcl 9 Oct 2002 05:04:09 -0000 1.2.2.1 @@ -1,22 +1,20 @@ ad_page_contract { - + Cronjob Delete - @author: tom@zmbh.com - @creation-date: 22 Sept 2001 - @cvs-id $Id$ + @author tom@zmbh.com + @creation-date 22 Sept 2001 + @cvs-id $Id$ } { cronjob_id:integer,trim,notnull } db_exec_plsql edit_cronjob { - - begin - cronjob.delete( - cronjob_id => :cronjob_id - ); - end; + + begin + cronjob.delete(cronjob_id => :cronjob_id); + end; } -ad_returnredirect cronjobs \ No newline at end of file +ad_returnredirect cronjobs Index: openacs-4/packages/cronjob/www/admin/cronjob-edit-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob-edit-oracle.xql,v diff -u -N -r1.1 -r1.1.4.1 --- openacs-4/packages/cronjob/www/admin/cronjob-edit-oracle.xql 4 Nov 2001 18:09:49 -0000 1.1 +++ openacs-4/packages/cronjob/www/admin/cronjob-edit-oracle.xql 9 Oct 2002 05:04:09 -0000 1.1.4.1 @@ -1,31 +1,26 @@ - oracle8.1.6 + oracle8.1.6 - - - - - begin - cronjob.set_attrs( - cronjob_id => :cronjob_id, - description => :description, - approved_p => :approved_p, - disabled_p => :disabled_p, - minute => :minute, - hr => :hr, - mon => :mon, - day => :day, - dayofweek => :dayofweek, - run_sql => :run_sql, - run_tcl => :run_tcl, - email => :email - ); - end; + + + begin + cronjob.set_attrs( + cronjob_id => :cronjob_id, + description => :description, + approved_p => :approved_p, + disabled_p => :disabled_p, + minute => :minute, + hr => :hr, + mon => :mon, + day => :day, + dayofweek => :dayofweek, + run_sql => :run_sql, + run_tcl => :run_tcl, + email => :email); + end; + + - - - - Index: openacs-4/packages/cronjob/www/admin/cronjob-edit-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob-edit-postgresql.xql,v diff -u -N -r1.1 -r1.1.4.1 --- openacs-4/packages/cronjob/www/admin/cronjob-edit-postgresql.xql 4 Nov 2001 18:09:49 -0000 1.1 +++ openacs-4/packages/cronjob/www/admin/cronjob-edit-postgresql.xql 9 Oct 2002 05:04:09 -0000 1.1.4.1 @@ -1,12 +1,11 @@ - postgresql7.1 + postgresql7.1 - - - - select [qd_write_query_select cronjob__set_attrs { + + + select [qd_write_query_select cronjob__set_attrs { cronjob_id => :cronjob_id description => :description approved_p => :approved_p @@ -19,9 +18,7 @@ run_sql => :run_sql run_tcl => :run_tcl email => :email } ] - - - - - + + + Index: openacs-4/packages/cronjob/www/admin/cronjob-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob-edit.tcl,v diff -u -N -r1.2 -r1.2.2.1 --- openacs-4/packages/cronjob/www/admin/cronjob-edit.tcl 10 Sep 2002 22:22:33 -0000 1.2 +++ openacs-4/packages/cronjob/www/admin/cronjob-edit.tcl 9 Oct 2002 05:04:09 -0000 1.2.2.1 @@ -1,29 +1,28 @@ ad_page_contract { Cronjobs Edit Page 2 - @author: tom@zmbh.com - @creation-date: 22 Sept 2001 - @cvs-id $Id$ + @author tom@zmbh.com + @creation-date 22 Sept 2001 + @cvs-id $Id$ } { cronjob_id:integer,trim,notnull - {description:trim,html ""} - {minute:trim ""} + {description:trim,html ""} + {minute:trim ""} {hr:trim ""} {mon:trim ""} {day:trim ""} {dayofweek:trim ""} {run_sql:trim ""} {run_tcl:trim ""} {email:trim,email ""} - {approved_p:trim ""} - {disabled_p:trim ""} - + {approved_p:trim ""} + {disabled_p:trim ""} } db_exec_plsql edit_cronjob { - begin + begin cronjob.set_attrs( cronjob_id => :cronjob_id, description => :description, @@ -36,9 +35,8 @@ dayofweek => :dayofweek, run_sql => :run_sql, run_tcl => :run_tcl, - email => :email - ); - end; + email => :email); + end; } -ad_returnredirect cronjobs \ No newline at end of file +ad_returnredirect cronjobs 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 -N -r1.3 -r1.3.2.1 --- openacs-4/packages/cronjob/www/admin/cronjob-run-now.tcl 10 Sep 2002 22:22:33 -0000 1.3 +++ openacs-4/packages/cronjob/www/admin/cronjob-run-now.tcl 9 Oct 2002 05:04:09 -0000 1.3.2.1 @@ -1,13 +1,12 @@ ad_page_contract { Run Cronjob - @author: tom@zmbh.com - @creation-date: 22 Sept 2001 - @cvs-id $Id$ + @author tom@zmbh.com + @creation-date 22 Sept 2001 + @cvs-id $Id$ } { cronjob_id:integer,trim,notnull - } ad_schedule_proc -once t -thread t 1 cronjob_run $cronjob_id Index: openacs-4/packages/cronjob/www/admin/cronjob.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob.tcl,v diff -u -N -r1.3 -r1.3.2.1 --- openacs-4/packages/cronjob/www/admin/cronjob.tcl 10 Sep 2002 22:22:33 -0000 1.3 +++ openacs-4/packages/cronjob/www/admin/cronjob.tcl 9 Oct 2002 05:04:09 -0000 1.3.2.1 @@ -1,21 +1,21 @@ ad_page_contract { Cronjobs List and Add Page - @author: tom@zmbh.com - @creation-date: 22 Sept 2001 - @cvs-id $Id$ + @author tom@zmbh.com + @creation-date 22 Sept 2001 + @cvs-id $Id$ } { - cronjob_id:integer,notnull + cronjob_id:integer,notnull } -properties { - page_title:onevalue - context:onevalue - hour_option:onevalue - minute_option:onevalue - month_option:onevalue - day_option:onevalue - dayofweek_option:onevalue + page_title:onevalue + context:onevalue + hour_option:onevalue + minute_option:onevalue + month_option:onevalue + day_option:onevalue + dayofweek_option:onevalue } set page_title "One Cronjob" @@ -28,77 +28,65 @@ set day_option "" set dayofweek_option "" +db_1row cronjob_query "" - -db_1row cronjob_query " -select - * -from - cronjobs -where - cronjob_id = :cronjob_id" - - - foreach {value name} [list "\*" "Every Month" 01 January 02 February 03 March 04 April 05 May 06 June 07 July 08 August 09 September 10 October 11 November 12 December] { - if {[string match $mon $value]} { - append month_option " + if {[string match $mon $value]} { + append month_option " " - } else { - append month_option " + } else { + append month_option " " - } + } } foreach {value name} [list "\*" "Every Day of Week" 0 Sunday 1 Monday 2 Tuesday 3 Wednesday 4 Thursday 5 Friday 6 Saturday] { - if {[string match $dayofweek $value]} { - append dayofweek_option " + if {[string match $dayofweek $value]} { + append dayofweek_option " " - } else { - append dayofweek_option " + } else { + append dayofweek_option " " - } + } } foreach {value name} [list "\*" "Every Day" 01 1 02 2 03 3 04 4 05 5 06 6 07 7 08 8 09 9 10 10 11 11 12 12 13 13 14 14 15 15 16 16 17 17 18 18 19 19 20 20 21 21 22 22 23 23 24 24 25 25 26 26 27 27 28 28 29 29 30 30 31 31] { - if {[string match $day $value]} { - append day_option " + if {[string match $day $value]} { + append day_option " " - } else { - append day_option " + } else { + append day_option " " - - } + + } } foreach {value name} [list "\*" "Every Hour" 00 0 01 1 02 2 03 3 04 4 05 5 06 6 07 7 08 8 09 9 10 10 11 11 12 12 13 13 14 14 15 15 16 16 17 17 18 18 19 19 20 20 21 21 22 22 23 23] { - if {[string match $hr $value]} { - append hour_option " + if {[string match $hr $value]} { + append hour_option " " - } else { - append hour_option " + } else { + append hour_option " " - - } + + } } foreach {value name} [list "\*" "Every Minute" 00 0 01 1 02 2 03 3 04 4 05 5 06 6 07 7 08 8 09 9 10 10\ - 11 11 12 12 13 13 14 14 15 15 16 16 17 17 18 18 19 19 20 20\ - 21 21 22 22 23 23 24 24 25 25 26 26 27 27 28 28 29 29 30 30\ - 31 31 32 32 33 33 34 34 35 35 36 36 37 37 38 38 39 39 40 40\ - 41 41 42 42 43 43 44 44 45 45 46 46 47 47 48 48 49 49 50 50\ - 51 51 52 52 53 53 54 54 55 55 56 56 57 57 58 58 59 59 ] { - if {[string match $minute $value]} { - append minute_option " + 11 11 12 12 13 13 14 14 15 15 16 16 17 17 18 18 19 19 20 20\ + 21 21 22 22 23 23 24 24 25 25 26 26 27 27 28 28 29 29 30 30\ + 31 31 32 32 33 33 34 34 35 35 36 36 37 37 38 38 39 39 40 40\ + 41 41 42 42 43 43 44 44 45 45 46 46 47 47 48 48 49 49 50 50\ + 51 51 52 52 53 53 54 54 55 55 56 56 57 57 58 58 59 59 ] { + if {[string match $minute $value]} { + append minute_option " " - } else { - append minute_option " + } else { + append minute_option " " - - } + + } } - - -ad_return_template \ No newline at end of file +ad_return_template Index: openacs-4/packages/cronjob/www/admin/cronjob.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob.xql,v diff -u -N -r1.1 -r1.1.4.1 --- openacs-4/packages/cronjob/www/admin/cronjob.xql 4 Nov 2001 18:09:49 -0000 1.1 +++ openacs-4/packages/cronjob/www/admin/cronjob.xql 9 Oct 2002 05:04:09 -0000 1.1.4.1 @@ -1,17 +1,12 @@ - - - -select - * -from - cronjobs -where - cronjob_id = :cronjob_id - - - - + + + select * + from cronjobs + where cronjob_id = :cronjob_id + + + Index: openacs-4/packages/cronjob/www/admin/cronjobs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjobs.tcl,v diff -u -N -r1.3 -r1.3.2.1 --- openacs-4/packages/cronjob/www/admin/cronjobs.tcl 10 Sep 2002 22:22:33 -0000 1.3 +++ openacs-4/packages/cronjob/www/admin/cronjobs.tcl 9 Oct 2002 05:04:09 -0000 1.3.2.1 @@ -1,18 +1,18 @@ ad_page_contract { - + Cronjobs List and Add Page - @author: tom@zmbh.com - @creation-date: 22 Sept 2001 - @cvs-id $Id$ + @author tom@zmbh.com + @creation-date 22 Sept 2001 + @cvs-id $Id$ } -properties { - page_title:onevalue - context:onevalue - hour_option:onevalue - minute_option:onevalue - month_option:onevalue - day_option:onevalue - dayofweek_option:onevalue + page_title:onevalue + context:onevalue + hour_option:onevalue + minute_option:onevalue + month_option:onevalue + day_option:onevalue + dayofweek_option:onevalue } set page_title "Cronjobs List and Add Page" @@ -26,39 +26,33 @@ set dayofweek_option "" foreach {value name} [list 01 January 02 February 03 March 04 April 05 May 06 June 07 July 08 August 09 September 10 October 11 November 12 December] { - append month_option " + append month_option " " } foreach {value name} [list 0 Sunday 1 Monday 2 Tuesday 3 Wednesday 4 Thursday 5 Friday 6 Saturday] { - append dayofweek_option " + append dayofweek_option " " } for {set i 1} {$i < 32} {incr i} { - append day_option " + append day_option " " } for {set i 0} {$i < 24} {incr i} { - append hour_option " + append hour_option " " } append minute_option $hour_option for {} {$i < 60} {incr i} { - append minute_option " + append minute_option " " } -db_multirow cronjobs cronjobs_query " -select - * -from - cronjobs -order by - user_id" +db_multirow cronjobs cronjobs_query "" -ad_return_template \ No newline at end of file +ad_return_template Index: openacs-4/packages/cronjob/www/admin/cronjobs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjobs.xql,v diff -u -N -r1.1 -r1.1.4.1 --- openacs-4/packages/cronjob/www/admin/cronjobs.xql 4 Nov 2001 18:09:49 -0000 1.1 +++ openacs-4/packages/cronjob/www/admin/cronjobs.xql 9 Oct 2002 05:04:09 -0000 1.1.4.1 @@ -1,17 +1,12 @@ - - - -select - * -from - cronjobs -order by - user_id - - - - + + + select * + from cronjobs + order by user_id + + +