version 1.66, 2003/04/01 16:53:50
|
version 1.68, 2003/04/11 15:14:25
|
Line 1039 sub get_student_data_from_performance_ca
|
Line 1039 sub get_student_data_from_performance_ca
|
"LEFT JOIN $symb_table AS d ON d.symb_id = a.symb_id ". |
"LEFT JOIN $symb_table AS d ON d.symb_id = a.symb_id ". |
"WHERE student='$student'"; |
"WHERE student='$student'"; |
if (defined($symb) && $symb ne '') { |
if (defined($symb) && $symb ne '') { |
$request .= " AND d.symb='".$dbh->quote($symb)."'"; |
$request .= " AND d.symb=".$dbh->quote($symb); |
} |
} |
} elsif (defined($symb) && $symb ne '') { |
} elsif (defined($symb) && $symb ne '') { |
$request .= "FROM $symb_table as d ". |
$request .= "FROM $symb_table as d ". |
Line 1070 sub get_student_data_from_performance_ca
|
Line 1070 sub get_student_data_from_performance_ca
|
$studentdata->{$symb}->{$base.'.awarddetail'} = $awarddetail; |
$studentdata->{$symb}->{$base.'.awarddetail'} = $awarddetail; |
$studentdata->{$symb}->{'timestamp'} = $time if (defined($time) && $time ne ''); |
$studentdata->{$symb}->{'timestamp'} = $time if (defined($time) && $time ne ''); |
} |
} |
|
if (defined($symb) && $symb ne '') { |
|
$studentdata = $studentdata->{$symb}; |
|
} |
return $studentdata; |
return $studentdata; |
} |
} |
|
|
Line 1121 sub get_current_state {
|
Line 1124 sub get_current_state {
|
my ($status,$data) = &ensure_current_data($sname,$sdom,$courseid); |
my ($status,$data) = &ensure_current_data($sname,$sdom,$courseid); |
# |
# |
if (defined($data)) { |
if (defined($data)) { |
return %$data; |
if (defined($symb)) { |
|
return %{$data->{$symb}}; |
|
} else { |
|
return %$data; |
|
} |
} elsif ($status eq 'no data') { |
} elsif ($status eq 'no data') { |
return (); |
return (); |
} else { |
} else { |