Index: openacs-4/packages/logger/tcl/variable-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/variable-procs.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/logger/tcl/variable-procs.tcl 29 Sep 2003 10:21:52 -0000 1.7 +++ openacs-4/packages/logger/tcl/variable-procs.tcl 4 Jan 2004 17:25:16 -0000 1.8 @@ -114,8 +114,26 @@ db_1row select_variable {} -column_array variable_array } -ad_proc -public logger::variable::get_default_variable_id {} { +ad_proc -public logger::variable::get_default_variable_id { + {-package_id {}} +} { Get the ID of the default (first) variable. } { - return [db_string select_first_variable_id {} -default {}] + if { [empty_string_p $package_id] && [ad_conn isconnected] } { + set package_id [ad_conn package_id] + } + if { ![empty_string_p $package_id] } { + # Get the default variable of the first active project in the given package + set primary_variables [db_list select_first_project_primary_variable {}] + + # Just the first + set variable_id [lindex $primary_variables 0] + } + + if { [empty_string_p $variable_id] } { + # Just get the first ever variable, most likely "Time" + set variable_id [db_string select_first_variable_id {} -default {}] + } + + return $variable_id }