';
+ $result.=&Apache::inputtags::file_selector($part,$id,
+ $uploadedfiletypes,'both');
+ $result.='';
}
return $result;
}
@@ -87,55 +83,134 @@ sub end_essayresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $part = $Apache::inputtags::part;
my $id = $Apache::inputtags::response[-1];
+ my $increment = &Apache::response::repetition();
my $result;
if ( $target eq 'grade' ) {
- my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};
+ my $collaborators = $env{'form.HWCOL'.$part.'_'.$id};
if ($collaborators =~ /[^\s]/) {
- my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"});
+ 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);
}
- my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
- if ($filename =~ /[^\s]/) {
- $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename;
- $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
- &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id);
- }
- if ( defined $ENV{'form.submitted'}) {
- my $response = $ENV{'form.HWVAL'.$id};
- if ( $response =~ /[^\s]/) {
- my $award;
- if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
+ if ( &Apache::response::submitted('scantron') ) {
+ $increment=&Apache::response::scored_response($part,$id);
+ } elsif ( &Apache::response::submitted() ) {
+ my $response = $env{'form.HWVAL_'.$id};
+ my $filename= $env{'form.HWFILE'.$part.'_'.$id.'.filename'};
+ my $portfiles = $env{'form.HWPORT'.$part.'_'.$id};
+ if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) {
+ my $award='DRAFT';
+ if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
$award='SUBMITTED';
- } else {
- $award='DRAFT';
}
+ my $uploadedflag=0;
+ &file_submission($part,$id,'filename',\$award,\$uploadedflag);
+ &file_submission($part,$id,'portfiles',\$award,\$uploadedflag);
$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);
- &Apache::response::handle_previous(\%previous,$award);
+ 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=&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') {
- $result.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Live blank on scoring form}\vskip 0 mm';
- &Apache::lonxml::increment_counter();
- $result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Leave blank on scoring form}\vskip 0 mm \end{enumerate}';
- &Apache::lonxml::increment_counter();
- }
+
+ } elsif ($target eq 'tex'
+ && $Apache::lonhomework::type eq 'exam') {
+ $result .= &Apache::inputtags::exam_score_line($target);
+
+ } elsif ($target eq 'answer') {
+ $result.=&Apache::response::answer_header($$tagstack[-1]);
+ $result.=&Apache::response::answer_part($$tagstack[-1],'');
+ $result.=&Apache::response::answer_footer($$tagstack[-1]);
}
+ 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 file_submission {
+ my ($part,$id,$which,$award,$uploadedflag)=@_;
+ my $files;
+ my $jspart=$part;
+ $jspart=~s/\./_/g;
+ if ($which eq 'portfiles') { $files= $env{'form.HWPORT'.$jspart.'_'.$id}; }
+ if ($which eq 'filename') {
+ $files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'};
+ }
+
+ if ($files =~ /[^\s]/) {
+ $files =~s/,$//;
+ $Apache::lonhomework::results{"resource.$part.$id.$which"}=$files;
+
+ my @submitted_files = ($files);
+ if ( $which eq 'portfiles' ) {
+ @submitted_files = split(/,/,$files);
+ }
+
+ my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
+ if ($uploadedfiletypes) {
+ $uploadedfiletypes=~s/[^\w\,]//g;
+ $uploadedfiletypes=','.$uploadedfiletypes.',';
+ foreach my $file (@submitted_files) {
+ my ($extension)=($file=~/\.(\w+)$/);
+ unless ($uploadedfiletypes=~/\,$extension\,/i) {
+ $$award='INVALID_FILETYPE';
+ }
+ }
+ }
+ if ($$award ne 'INVALID_FILETYPE' && ref($uploadedflag)) {
+ $$uploadedflag=1;
+ }
+ if ($$award ne 'INVALID_FILETYPE' && $which eq 'portfiles') {
+ my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+ &Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]);
+ &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,[$symb,$crsid]);
+ &Apache::lonnet::clear_selected_files($name);
+ }
+ if ($$award ne 'INVALID_FILETYPE' && $which eq 'filename') {
+ $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=
+ $files;
+ $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
+ &Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$id,undef,
+ 'essayresponse');
+ }
+ } elsif ($which eq 'portfiles' &&
+ $Apache::lonhomework::history{"resource.$part.$id.$which"}) {
+ my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+ &Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]);
+ $Apache::lonhomework::results{"resource.$part.$id.$which"}="";
+ }
+}
+
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'});
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'});
my (@badcollaborators,$result);
my (@collaborators) = split(/\,?\s+/,$coll);
foreach (@collaborators) {
@@ -143,7 +218,7 @@ sub check_collaborators {
if (/@/) {
$collaborator =~ s/@/:/;
} else {
- $collaborator = $_.':'.$ENV{'user.domain'};
+ $collaborator = $_.':'.$env{'user.domain'};
}
push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist);
}