--- loncom/interface/loncoursedata.pm 2003/04/01 16:53:50 1.66 +++ loncom/interface/loncoursedata.pm 2003/04/11 15:14:25 1.68 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: loncoursedata.pm,v 1.66 2003/04/01 16:53:50 matthew Exp $ +# $Id: loncoursedata.pm,v 1.68 2003/04/11 15:14:25 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1039,7 +1039,7 @@ sub get_student_data_from_performance_ca "LEFT JOIN $symb_table AS d ON d.symb_id = a.symb_id ". "WHERE student='$student'"; if (defined($symb) && $symb ne '') { - $request .= " AND d.symb='".$dbh->quote($symb)."'"; + $request .= " AND d.symb=".$dbh->quote($symb); } } elsif (defined($symb) && $symb ne '') { $request .= "FROM $symb_table as d ". @@ -1070,6 +1070,9 @@ sub get_student_data_from_performance_ca $studentdata->{$symb}->{$base.'.awarddetail'} = $awarddetail; $studentdata->{$symb}->{'timestamp'} = $time if (defined($time) && $time ne ''); } + if (defined($symb) && $symb ne '') { + $studentdata = $studentdata->{$symb}; + } return $studentdata; } @@ -1121,7 +1124,11 @@ sub get_current_state { my ($status,$data) = &ensure_current_data($sname,$sdom,$courseid); # if (defined($data)) { - return %$data; + if (defined($symb)) { + return %{$data->{$symb}}; + } else { + return %$data; + } } elsif ($status eq 'no data') { return (); } else {