--- loncom/homework/essayresponse.pm 2010/04/20 23:59:53 1.105
+++ loncom/homework/essayresponse.pm 2010/04/22 13:00:24 1.106
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# essay (ungraded) style responses
#
-# $Id: essayresponse.pm,v 1.105 2010/04/20 23:59:53 www Exp $
+# $Id: essayresponse.pm,v 1.106 2010/04/22 13:00:24 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -105,7 +105,7 @@ sub start_essayresponse {
my @msgs;
if ($Apache::lonhomework::history{"resource.$part.$id.collaborators"} =~ /\S/) {
my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
- $result .= '
'.&mt('Collaborated with [_1]',$coll).' | ';
+ $result .= ''.&mt('Collaborated with [_1]',$coll).' | ';
}
my $file_submission =
@@ -136,12 +136,14 @@ sub end_essayresponse {
my $increment = &Apache::response::repetition();
my $result;
if ( $target eq 'grade' ) {
- my $collaborators = $env{'form.HWCOL'.$part.'_'.$id};
- if ($collaborators =~ /[^\s]/) {
- my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
- $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
- if ($collaborators ne $previous_list);
- }
+# Deal with collaborators
+ my $collaborators = $env{'form.HWCOL'.$part.'_'.$id};
+ my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
+ if ($collaborators ne $previous_list) {
+# &Apache::lonnet::logthis("New collaborators [$collaborators] [$previous_list]");
+ $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators;
+ }
+# Scantron
if ( &Apache::response::submitted('scantron') ) {
$increment=&Apache::response::scored_response($part,$id);
} elsif ( &Apache::response::submitted() ) {
@@ -419,7 +421,7 @@ sub check_collaborators {
$env{'course.'.$env{'request.course.id'}.'.num'});
my (@badcollaborators,$result);
- my (@collaborators) = split(/,?\s+/,$coll);
+ my (@collaborators) = split(/[,;\s]+/,$coll);
foreach my $entry (@collaborators) {
my $collaborator;
if ($entry =~ /:/) {
@@ -467,7 +469,7 @@ __END__
=head1 NAME
-Apache::easyresponse
+Apache::essayresponse
=head1 SYNOPSIS