[BACK]Return to externalresponse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/externalresponse.pm between versions 1.21 and 1.22

version 1.21, 2013/08/22 10:13:34 version 1.22, 2013/08/22 11:13:43
Line 245  sub end_externalresponse { Line 245  sub end_externalresponse {
                 }                  }
             }              }
     my $response = &Apache::response::getresponse();      my $response = &Apache::response::getresponse();
             my $filestest;  
             my $fileshistory = $Apache::lonhomework::history{"resource.$part.$id.portfiles"};              my $filesresults=0;
             $fileshistory .=   $Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};  # Previously turned in files
             my $filesresults = $Apache::lonhomework::results{"resource.$part.$id.portfiles"};              my %previously_turned_in=();
             $filesresults .=   $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"};              foreach my $file (split(/\,/,$Apache::lonhomework::history{"resource.$part.$id.portfiles"}.','.
     if (( $response =~ /[^\s]/) ||  $filesresults || $fileshistory) {                                           $Apache::lonhomework::history{"resource.$part.$id.uploadedurl"})) {
                  if ($file=~/\S/) {
                     $previously_turned_in{'/uploaded/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/portfolio'.$file}=1;
                  }
               }
   # Currently turned in files
               my %currently_turned_in=();
               foreach my $file (split(/\,/,$Apache::lonhomework::results{"resource.$part.$id.portfiles"}.','.
                                            $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"})) {
                  if ($file=~/\S/) {
                     $filesresults=1;
                     $currently_turned_in{'/uploaded/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/portfolio'.$file}=1;
                  }
               }
               my $filelinks=join(',',map{&escape($_)}(keys(%currently_turned_in)));
               &Apache::lonnet::logthis("Previously: ".join("\n",sort(keys(%previously_turned_in))));
               &Apache::lonnet::logthis("Currently: ".join("\n",sort(keys(%currently_turned_in))));
               &Apache::lonnet::logthis("File flag: ".$filesresults);
               &Apache::lonnet::logthis("Links String: ".$filelinks);
       if (( $response =~ /[^\s]/) ||  $filesresults ) {
  my $url = &Apache::lonxml::get_param('url',$parstack,$safeeval);   my $url = &Apache::lonxml::get_param('url',$parstack,$safeeval);
  my $answer = &Apache::lonxml::get_param('answer',$parstack,$safeeval);   my $answer = &Apache::lonxml::get_param('answer',$parstack,$safeeval);
  my %form = &Apache::lonxml::get_param_var('form',$parstack,$safeeval);   my %form = &Apache::lonxml::get_param_var('form',$parstack,$safeeval);
Line 258  sub end_externalresponse { Line 277  sub end_externalresponse {
  $form{'LONCAPA_correct_answer'}=$answer;   $form{'LONCAPA_correct_answer'}=$answer;
  $form{'LONCAPA_language'}=   $form{'LONCAPA_language'}=
     &Apache::lonnet::metadata($ENV{'REQUEST_URI'},'language');      &Apache::lonnet::metadata($ENV{'REQUEST_URI'},'language');
                 $form{'LONCAPA_student_submitted_files_results'} = $filesresults;                  $form{'LONCAPA_student_submitted_files'} = $filelinks;
                 $form{'LONCAPA_student_submitted_files_history'} = $fileshistory;  
  &Apache::lonxml::debug("Asking $url, with:");   &Apache::lonxml::debug("Asking $url, with:");
  &Apache::lonhomework::showhash(%form);   &Apache::lonhomework::showhash(%form);
                 my $udom = &Apache::lonnet::EXT('user.domain');                  my $udom = &Apache::lonnet::EXT('user.domain');
Removed from v.1.21  
changed lines
  Added in v.1.22

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>