';
+ }
+ return $result;
}
sub end_essayresponse {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if ( $target eq 'grade' ) {
- if ( defined $ENV{'form.submitted'}) {
- my $id = $Apache::inputtags::response['-1'];
- my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
- my $collaborators = $ENV{'form.HWCOL'.$Apache::inputtags::response['-1']};
- if ( $response =~ /[^\s]/) {
- my $part=$Apache::inputtags::part;
- $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
- $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}="SUBMITTED";
-# $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators;
- my %previous=&Apache::response::check_for_previous($response,$part,$id);
- &Apache::response::handle_previous(\%previous,'SUBMITTED');
- }
- }
- }
- &Apache::response::end_response;
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $part = $Apache::inputtags::part;
+ my $id = $Apache::inputtags::response[-1];
+ my $increment = 1;
+ 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);
+ }
+ if ( defined($ENV{'form.submitted'}) &&
+ $ENV{'form.submitted'} eq 'scantron' ) {
+ $increment=&Apache::response::scored_response($part,$id);
+ } elsif ( defined($ENV{'form.submitted'}) ) {
+ my $response = $ENV{'form.HWVAL_'.$id};
+ my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
+ my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id};
+ &Apache::lonnet::logthis("portfiles now $portfiles");
+ if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) {
+ my $award;
+ if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
+ $award='SUBMITTED';
+ } else {
+ $award='DRAFT';
+ }
+ my $uploadedflag=0;
+ if ($filename =~ /[^\s]/) {
+ &Apache::lonnet::logthis("the file to upload is $filename");
+ my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
+ $uploadedfiletypes=~s/[^\w\,]//g;
+ $uploadedfiletypes=','.$uploadedfiletypes.',';
+ my ($extension)=($filename=~/\.(\w+)$/);
+ if ($uploadedfiletypes=~/\,$extension\,/i) {
+ $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename;
+ $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
+ &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,'essayresponse');
+ $uploadedflag=1;
+ } else {
+ $award='INVALID_FILETYPE';
+ }
+ } else {
+ $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}="";
+ $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}="";
+ }
+ if ($portfiles =~ /[^\s]/) {
+ $portfiles =~s/,$//;
+ $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles;
+ my @submitted_files = split /,/,$portfiles;
+ my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+ &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);
+ &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$dsymb.$crsid);
+ &Apache::lonnet::clear_selected_files($name);
+ $uploadedflag=1;
+ } else {
+ $Apache::lonhomework::results{"resource.$part.$id.portfiles"}="";
+ }
+ $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
+ $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award;
+ my %previous=&Apache::response::check_for_previous($response,$part,$id);
+ unless ($uploadedflag) { &Apache::response::handle_previous(\%previous,$award); }
+#
+# Store with resource author for similarity testing
+#
+ if ($award eq 'SUBMITTED') {
+ my ($symb,$crsid,$domain,$name)=
+ &Apache::lonxml::whichuser();
+ if ($crsid) {
+ my $akey=$name.'.'.$domain.'.'.$crsid;
+ my $essayurl=
+ &Apache::lonnet::declutter($ENV{'REQUEST_URI'});
+ my ($adom,$aname,$apath)=
+ ($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
+ $apath=&Apache::lonnet::escape($apath);
+ $apath=~s/\W/\_/gs;
+ &Apache::lonnet::put('nohist_essay_'.$apath,
+ { $akey => $response },$adom,$aname);
+ }
+ }
+ }
+ }
+ } elsif ($target eq 'edit') {
+ $result.=&Apache::edit::end_table();
+ } elsif ($target eq 'tex') {
+ if ($Apache::lonhomework::type eq 'exam') {
+ my $repetition=&Apache::response::repetition();
+ $result.='\begin{enumerate}';
+ if ($ENV{'request.state'} eq "construct" ) {$result.='\item[\strut]';}
+ for (my $i=0;$i<$repetition;$i++) {
+ $result.='\item[\textbf{'.($Apache::lonxml::counter+$i).
+ '}.]\textit{'.&mt('Leave blank on scoring form').
+ '}\vskip 0 mm';
+ }
+ $result.= '\end{enumerate}';
+ $increment=$repetition;
+ }
+ }
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
+ $target eq 'tex' || $target eq 'analyze') {
+ &Apache::lonxml::increment_counter($increment);
+ }
+ &Apache::response::end_response;
+
+ return $result;
+}
+
+sub check_collaborators {
+ my ($ncol,$coll) = @_;
+ my %classlist=&Apache::lonnet::dump('classlist',
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ my (@badcollaborators,$result);
+ my (@collaborators) = split(/\,?\s+/,$coll);
+ foreach (@collaborators) {
+ my $collaborator = $_;
+ if (/@/) {
+ $collaborator =~ s/@/:/;
+ } else {
+ $collaborator = $_.':'.$ENV{'user.domain'};
+ }
+ push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist);
+ }
+
+ if (scalar(@badcollaborators)) {
+ $result = '
'.
+ $uploadedfile.'';
+ $result.=&mt('Currently submitted: [_1]',$curfile);
+ } else {
+ $result.=&mt('(Hand in a file you have prepared on your computer)');
+ }
+ $result.='