Index: openacs-4/packages/logger/sql/postgresql/logger-packages-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/sql/postgresql/logger-packages-create.sql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/logger/sql/postgresql/logger-packages-create.sql 8 May 2003 13:54:26 -0000 1.4 +++ openacs-4/packages/logger/sql/postgresql/logger-packages-create.sql 9 May 2003 11:04:13 -0000 1.5 @@ -58,16 +58,15 @@ v_rec record; begin -- Delete all entries in the project - for v_rec in (select entry_id + for v_rec in select entry_id from logger_entries - where project_id = p_project_id - ) + where project_id = p_project_id loop - logger_entry__del(v_rec.entry_id); + perform logger_entry__del(v_rec.entry_id); end loop; -- Delete all variables only mapped to this project. - for v_rec in (select variable_id + for v_rec in select variable_id from logger_variables where exists (select 1 from logger_project_pkg_map @@ -77,9 +76,8 @@ from logger_project_pkg_map where project_id <> p_project_id ) - ) loop - logger_variable.del(v_rec.variable_id); + perform logger_variable__del(v_rec.variable_id); end loop; -- Delete the project acs object. This will cascade the row in the logger_projects table @@ -187,7 +185,7 @@ timestamptz, varchar, integer, - integer) + varchar) returns integer as ' declare p_entry_id alias for $1; Index: openacs-4/packages/logger/sql/postgresql/logger-packages-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/sql/postgresql/logger-packages-drop.sql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/logger/sql/postgresql/logger-packages-drop.sql 8 May 2003 13:54:26 -0000 1.4 +++ openacs-4/packages/logger/sql/postgresql/logger-packages-drop.sql 9 May 2003 11:04:13 -0000 1.5 @@ -41,6 +41,6 @@ timestamptz, varchar, integer, - integer); + varchar); drop function logger_entry__del (integer) ; drop function logger_entry__name (integer) ; Index: openacs-4/packages/logger/sql/postgresql/logger-tables-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/sql/postgresql/logger-tables-create.sql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/logger/sql/postgresql/logger-tables-create.sql 8 May 2003 13:54:26 -0000 1.4 +++ openacs-4/packages/logger/sql/postgresql/logger-tables-create.sql 9 May 2003 11:04:13 -0000 1.5 @@ -173,7 +173,7 @@ end_time timestamptz constraint logger_projections_et_nn not null, - value real + value decimal constraint logger_projections_value_nn not null ); Index: openacs-4/packages/logger/www/log.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/log.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/logger/www/log.adp 8 May 2003 13:55:50 -0000 1.6 +++ openacs-4/packages/logger/www/log.adp 9 May 2003 11:04:43 -0000 1.7 @@ -45,10 +45,12 @@ -

- » - Add new log entry -

+ +

+ » + Add new log entry +

+

Log history for the past @log_history_n_days@ days

Index: openacs-4/packages/logger/www/log.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/log.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/logger/www/log.tcl 8 May 2003 13:55:50 -0000 1.7 +++ openacs-4/packages/logger/www/log.tcl 9 May 2003 11:04:43 -0000 1.8 @@ -19,7 +19,7 @@ } set package_id [ad_conn package_id] -set current_user_id [ad_conn user_id] +set current_user_id [ad_maybe_redirect_for_registration] if { [exists_and_not_null entry_id] } { set entry_exists_p [db_string entry_exists_p {}] @@ -125,7 +125,7 @@ {value:float {label $variable_array(name)} {after_html $variable_array(unit)} - {html {size 10}} + {html {size 9 maxlength 9}} } {description:text,optional @@ -147,8 +147,8 @@ ad_form -extend -name log_entry_form -select_query_name select_logger_entries -validate { {value - { [regexp {^([^.]+|[^.]*\.[0-9]{0,2})$} $value] } - {The value may not contain more than two decimals} + { [regexp {^([0-9]{1,6}|[0-9]{0,6}\.[0-9]{0,2})$} $value] } + {The value may not contain more than two decimals and must be between 0 and 999999.99} } } -new_data { set time_stamp_ansi "[lindex $time_stamp 0]-[lindex $time_stamp 1]-[lindex $time_stamp 2]" @@ -217,5 +217,3 @@ set url "log?[export_vars -override { {variable_id $unique_id} } { project_id }]" set selected_p [string equal $variable_id $unique_id] } - - Index: openacs-4/packages/logger/www/lib/entries-table.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/lib/Attic/entries-table.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/logger/www/lib/entries-table.tcl 8 May 2003 13:56:20 -0000 1.4 +++ openacs-4/packages/logger/www/lib/entries-table.tcl 9 May 2003 11:05:02 -0000 1.5 @@ -71,7 +71,7 @@ } if { $value_count > 0 } { - set value_average [expr round(100 * $value_total / $value_count) / 100.0] } { + set value_average [expr round(100.0 * $value_total / $value_count) / 100.0] } { set value_average "n/a" }