--- loncom/homework/grades.pm 2007/07/04 20:28:44 1.420 +++ loncom/homework/grades.pm 2007/07/06 23:17:28 1.421 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.420 2007/07/04 20:28:44 www Exp $ +# $Id: grades.pm,v 1.421 2007/07/06 23:17:28 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -6133,6 +6133,7 @@ sub gather_clicker_ids { (&Apache::lonnet::userenvironment($domain,$username,'clickers'))[1]; foreach my $id (split(/\,/,$clickers)) { $id=~s/^[\#0]+//; + $id=~s/[\-\:]//g; if (exists($clicker_ids{$id})) { $clicker_ids{$id}.=','.$username.':'.$domain; } else { @@ -6155,6 +6156,7 @@ sub gather_adv_clicker_ids { (&Apache::lonnet::userenvironment($pudom,$puname,'clickers'))[1]; foreach my $id (split(/\,/,$clickers)) { $id=~s/^[\#0]+//; + $id=~s/[\-\:]//g; if (exists($clicker_ids{$id})) { $clicker_ids{$id}.=','.$puname.':'.$pudom; } else { @@ -6301,6 +6303,7 @@ sub process_clicker_file { $correct_id=~tr/a-z/A-Z/; $correct_id=~s/\s//gs; $correct_id=~s/^[\#0]+//; + $correct_id=~s/[\-\:]//g; if ($correct_id) { $correct_ids{$correct_id}='specified'; } @@ -6462,6 +6465,8 @@ sub interwrite_eval { } my $id=$entries[4]; $id=~s/^[\#0]+//; + $id=~s/^v\d*\://i; + $id=~s/[\-\:]//g; $idresponses{$id}[$number]=$entries[6]; } foreach my $id (keys %idresponses) {