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

Diff for /loncom/homework/lonhomework.pm between versions 1.141 and 1.161

version 1.141, 2003/09/15 18:43:53 version 1.161, 2004/01/28 15:45:44
Line 24 Line 24
 # /home/httpd/html/adm/gpl.txt  # /home/httpd/html/adm/gpl.txt
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  
 # Guy Albertelli  
 # 11/30 Gerd Kortemeyer  
 # 6/1,8/17,8/18 Gerd Kortemeyer  
 # 7/18 Jeremy Bowers  
   
 package Apache::lonhomework;  package Apache::lonhomework;
 use strict;  use strict;
Line 54  use Apache::chemresponse(); Line 50  use Apache::chemresponse();
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use HTML::Entities();  use HTML::Entities();
 use Apache::loncommon();  use Apache::loncommon();
   use Apache::lonlocal;
 #use Time::HiRes qw( gettimeofday tv_interval );  #use Time::HiRes qw( gettimeofday tv_interval );
   
 BEGIN {  BEGIN {
   &Apache::lonxml::register_insert();      &Apache::lonxml::register_insert();
 }  }
   
 sub get_target {  sub get_target {
   if (($ENV{'request.state'} eq "published") ||      if (($ENV{'request.state'} eq "published") ||
       ($ENV{'request.state'} eq "uploaded")) {   ($ENV{'request.state'} eq "uploaded")) {
     if ( defined($ENV{'form.grade_target'}  )    if ( defined($ENV{'form.grade_target'}  ) 
  && ($ENV{'form.grade_target'} eq 'tex')) {       && ($ENV{'form.grade_target'} eq 'tex')) {
       return ($ENV{'form.grade_target'});      return ($ENV{'form.grade_target'});
     } elsif ( defined($ENV{'form.grade_target'}  )    } elsif ( defined($ENV{'form.grade_target'}  ) 
  && ($Apache::lonhomework::viewgrades eq 'F' )) {    && ($Apache::lonhomework::viewgrades eq 'F' )) {
       return ($ENV{'form.grade_target'});      return ($ENV{'form.grade_target'});
     } elsif (defined($ENV{'form.grade_target'}  )    }
  && ($ENV{'form.grade_target'} eq 'answer')) {  
       return ($ENV{'form.grade_target'});  
     }  
    
     if ( defined($ENV{'form.submitted'}) &&  
  ( !defined($ENV{'form.resetdata'})) &&  
  ( !defined($ENV{'form.newrandomization'}))) {  
       return ('grade', 'web');  
     } else {  
       return ('web');  
     }  
   } elsif ($ENV{'request.state'} eq "construct") {  
     if ( defined($ENV{'form.grade_target'}) ) {  
       return ($ENV{'form.grade_target'});  
     }  
     if ( defined($ENV{'form.preview'})) {  
       if ( defined($ENV{'form.submitted'})) {  
  return ('grade', 'web');  
       } else {  
  return ('web');  
       }  
     } else {  
       if ( $ENV{'form.problemmode'} eq 'View' ||  
    $ENV{'form.problemmode'} eq 'Discard Edits and View') {  
  if ( defined($ENV{'form.submitted'}) &&   if ( defined($ENV{'form.submitted'}) &&
      (!defined($ENV{'form.resetdata'})) &&       ( !defined($ENV{'form.resetdata'})) &&
      (!defined($ENV{'form.newrandomization'}))) {       ( !defined($ENV{'form.newrandomization'}))) {
   return ('grade', 'web','answer');      return ('grade', 'web');
  } else {   } else {
   return ('web','answer');      return ('web');
  }   }
       } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {      } elsif ($ENV{'request.state'} eq "construct") {
  if ( $ENV{'form.submitted'} eq 'edit' ) {   if ( defined($ENV{'form.grade_target'}) ) {
   if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) {      return ($ENV{'form.grade_target'});
     return ('modified','web','answer');   }
   } else {   if ( defined($ENV{'form.preview'})) {
     return ('modified','edit');      if ( defined($ENV{'form.submitted'})) {
   }   return ('grade', 'web');
  } else {      } else {
   return ('edit');   return ('web');
  }      }
       } else {   } else {
  return ('web');      if ( $ENV{'form.problemmode'} eq &mt('View') ||
       }   $ENV{'form.problemmode'} eq &mt('Discard Edits and View')) {
    if ( defined($ENV{'form.submitted'}) &&
        (!defined($ENV{'form.resetdata'})) &&
        (!defined($ENV{'form.newrandomization'}))) {
       return ('grade', 'web','answer');
    } else {
       return ('web','answer');
    }
       } elsif ( $ENV{'form.problemmode'} eq &mt('Edit') ) {
    if ( $ENV{'form.submitted'} eq 'edit' ) {
       if ( $ENV{'form.submit'} eq &mt('Submit Changes and View') ) {
    return ('modified','web','answer');
       } else {
    return ('modified','edit');
       }
    } else {
       return ('edit');
    }
       } else {
    return ('web');
       }
    }
     }      }
   }      return ();
   return ();  
 }  }
   
 sub setup_vars {  sub setup_vars {
   my ($target) = @_;      my ($target) = @_;
   return ';'      return ';'
 #  return ';$external::target='.$target.';';  #  return ';$external::target='.$target.';';
 }  }
   
 sub send_header {  sub send_header {
   my ($request)= @_;      my ($request)= @_;
   $request->print(&Apache::lontexconvert::header());      $request->print(&Apache::lontexconvert::header());
 #  $request->print('<form name='.$ENV{'form.request.prefix'}.'lonhomework method="POST" action="'.$request->uri.'">');  #  $request->print('<form name='.$ENV{'form.request.prefix'}.'lonhomework method="POST" action="'.$request->uri.'">');
 }  }
   
 sub createmenu {  sub createmenu {
   my ($which,$request)=@_;      my ($which,$request)=@_;
   if ($which eq 'grade') {      if ($which eq 'grade') {
     $request->print('<script language="JavaScript">    $request->print('<script language="JavaScript"> 
           hwkmenu=window.open("/res/adm/pages/homeworkmenu.html","homeworkremote",            hwkmenu=window.open("/res/adm/pages/homeworkmenu.html","homeworkremote",
                  "height=350,width=150,menubar=no");                   "height=350,width=150,menubar=no");
           </script>');            </script>');
   }      }
 }  }
   
 sub send_footer {  sub send_footer {
   my ($request)= @_;      my ($request)= @_;
 #  $request->print('</form>');  #  $request->print('</form>');
   $request->print(&Apache::lontexconvert::footer());      $request->print(&Apache::lontexconvert::footer());
 }  }
   
 $Apache::lonxml::browse='';  $Apache::lonxml::browse='';
   
   sub check_ip_acc {
       my ($acc)=@_;
       if (!defined($acc) || $acc =~ /^\s*$/) { return 1; }
       my $allowed=0;
       my $ip=$ENV{'REMOTE_ADDR'};
       my $name;
       foreach my $pattern (split(',',$acc)) {
    if ($pattern =~ /\*$/) {
       #35.8.*
       $pattern=~s/\*//;
       if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
    } elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) {    
       #35.8.3.[34-56]
       my $low=$2;
       my $high=$3;
       $pattern=$1;
       if ($ip =~ /^\Q$pattern\E/) { 
    my $last=(split(/\./,$ip))[3];
    if ($last <=$high && $last >=$low) { $allowed=1; }
       }
    } elsif ($pattern =~ /^\*/) {
       #*.msu.edu
       $pattern=~s/\*//;
       if (!defined($name)) {
    use Socket;
    my $netaddr=inet_aton($ip);
    ($name)=gethostbyaddr($netaddr,AF_INET);
       }
       if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
    } elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) {
       #127.0.0.1
       if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
    } else {
       #some.name.com
       if (!defined($name)) {
    use Socket;
    my $netaddr=inet_aton($ip);
    ($name)=gethostbyaddr($netaddr,AF_INET);
       }
       if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
    }
    if ($allowed) { last; }
       }
       return $allowed;
   }
 # JB, 9/24/2002: Any changes in this function may require a change  # JB, 9/24/2002: Any changes in this function may require a change
 # in lonnavmaps::resource::getDateStatus.  # in lonnavmaps::resource::getDateStatus.
 sub check_access {  sub check_access {
   my ($id) = @_;      my ($id) = @_;
   my $date ='';      my $date ='';
   my $status;      my $status;
   my $datemsg = '';      my $datemsg = '';
   my $lastdate = '';      my $lastdate = '';
   my $temp;      my $temp;
   my $type;      my $type;
   my $passed;      my $passed;
   
   if ($ENV{'request.state'} eq "construct") {      if ($ENV{'request.state'} eq "construct") {
     &Apache::lonxml::debug("in construction ignoring dates");   &Apache::lonxml::debug("in construction ignoring dates");
     $status='CAN_ANSWER';   $status='CAN_ANSWER';
     $datemsg='is in under construction';   $datemsg=&mt('is in under construction');
     return ($status,$datemsg);   return ($status,$datemsg);
   }      }
   
   &Apache::lonxml::debug("checking for part :$id:");      &Apache::lonxml::debug("checking for part :$id:");
   &Apache::lonxml::debug("time:".time);      &Apache::lonxml::debug("time:".time);
   foreach $temp ("opendate","duedate","answerdate") {      
     $lastdate = $date;      my $allowed=&check_ip_acc(&Apache::lonnet::EXT("resource.$id.acc"));
     $date = &Apache::lonnet::EXT("resource.$id.$temp");      if (!$allowed && ($Apache::lonhomework::browse ne 'F')) {
     my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type");   $status='INVALID_ACCESS';
     if ($thistype =~ /^(con_lost|no_such_host)/ ||   $date=&mt("can not be accessed from your location.");
  $date     =~ /^(con_lost|no_such_host)/) {  
  $status='UNAVAILABLE';  
  $date="may open later.";  
  return($status,$date);   return($status,$date);
     }      }
     if ($thistype eq 'date_interval') {  
  if ($temp eq 'opendate') {      foreach $temp ("opendate","duedate","answerdate") {
            $date=&Apache::lonnet::EXT("resource.$id.duedate")-$date;   $lastdate = $date;
         }   $date = &Apache::lonnet::EXT("resource.$id.$temp");
         if ($temp eq 'answerdate') {   my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type");
            $date=&Apache::lonnet::EXT("resource.$id.duedate")+$date;   if ($thistype =~ /^(con_lost|no_such_host)/ ||
         }      $date     =~ /^(con_lost|no_such_host)/) {
     }      $status='UNAVAILABLE';
     &Apache::lonxml::debug("found :$date: for :$temp:");      $date=&mt("may open later.");
     if ($date eq '') {      return($status,$date);
       $date = "an unknown date"; $passed = 0;   }
     } elsif ($date eq 'con_lost') {   if ($thistype eq 'date_interval') {
       $date = "an indeterminate date"; $passed = 0;      if ($temp eq 'opendate') {
     } else {   $date=&Apache::lonnet::EXT("resource.$id.duedate")-$date;
       if (time < $date) { $passed = 0; } else { $passed = 1; }      }
       $date = localtime $date;      if ($temp eq 'answerdate') {
    $date=&Apache::lonnet::EXT("resource.$id.duedate")+$date;
       }
    }
    &Apache::lonxml::debug("found :$date: for :$temp:");
    if ($date eq '') {
       $date = &mt("an unknown date"); $passed = 0;
    } elsif ($date eq 'con_lost') {
       $date = &mt("an indeterminate date"); $passed = 0;
    } else {
       if (time < $date) { $passed = 0; } else { $passed = 1; }
       $date = localtime $date;
    }
    if (!$passed) { $type=$temp; last; }
     }      }
     if (!$passed) { $type=$temp; last; }      &Apache::lonxml::debug("have :$type:$passed:");
   }      if ($passed) {
   &Apache::lonxml::debug("have :$type:$passed:");   $status='SHOW_ANSWER';
   if ($passed) {   $datemsg=$date;
     $status='SHOW_ANSWER';      } elsif ($type eq 'opendate') {
     $datemsg=$date;   $status='CLOSED';
   } elsif ($type eq 'opendate') {   $datemsg = &mt("will open on")." $date";
     $status='CLOSED';      } elsif ($type eq 'duedate') {
     $datemsg = "will open on $date";   $status='CAN_ANSWER';
   } elsif ($type eq 'duedate') {   $datemsg = &mt("is due at")." $date";
     $status='CAN_ANSWER';      } elsif ($type eq 'answerdate') {
     $datemsg = "is due at $date";   $status='CLOSED';
   } elsif ($type eq 'answerdate') {   $datemsg = &mt("was due on")." $lastdate".&mt(", and answers will be available on")." $date";
     $status='CLOSED';      }
     $datemsg = "was due on $lastdate, and answers will be available on $date";      if ($status eq 'CAN_ANSWER') {
   }   #check #tries, and if correct.
   if ($status eq 'CAN_ANSWER') {   my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
     #check #tries, and if correct.   my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
     my $tries = $Apache::lonhomework::history{"resource.$id.tries"};   if ( $tries eq '' ) { $tries = '0'; }
     my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");   if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ( $tries eq '' ) { $tries = '0'; }   if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
     if ( $maxtries eq '' ) { $maxtries = '2'; }    # if (correct and show prob status) or excused then CANNOT_ANSWER
     if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }   if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
     # if (correct and show prob status) or excused then CANNOT_ANSWER      &&
     if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/      lc($Apache::lonhomework::problemstatus) ne 'no')
  &&     ||
  lc($Apache::lonhomework::problemstatus) ne 'no')     $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {
        ||      $status = 'CANNOT_ANSWER';
        $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {   }
  $status = 'CANNOT_ANSWER';  
     }      }
   }  
   
   #if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&    #if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
   #    (!$Apache::lonhomework::history{"resource.0.outtoken"})) {    #    (!$Apache::lonhomework::history{"resource.0.outtoken"})) {
Line 236  sub check_access { Line 283  sub check_access {
   #}    #}
   
   
   &Apache::lonxml::debug("sending back :$status:$datemsg:");      &Apache::lonxml::debug("sending back :$status:$datemsg:");
   if (($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED')) {      if (($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED')) {
     &Apache::lonxml::debug("should be allowed to browse a resource when closed");   &Apache::lonxml::debug("should be allowed to browse a resource when closed");
     $status='CAN_ANSWER';   $status='CAN_ANSWER';
     $datemsg='is closed but you are allowed to view it';   $datemsg=&mt('is closed but you are allowed to view it');
   }      }
   
   return ($status,$datemsg);      return ($status,$datemsg);
 }  }
   
 sub showhash {  sub showhash {
   my (%hash) = @_;      my (%hash) = @_;
   &showhashsubset(\%hash,'.');      &showhashsubset(\%hash,'.');
   return '';      return '';
 }  }
   
 sub showarray {  sub showarray {
Line 270  sub showarray { Line 317  sub showarray {
 }  }
   
 sub showhashsubset {  sub showhashsubset {
   my ($hash,$keyre) = @_;      my ($hash,$keyre) = @_;
   my $resultkey;      my $resultkey;
   foreach $resultkey (sort keys %$hash) {      foreach $resultkey (sort keys %$hash) {
     if ($resultkey =~ /$keyre/) {   if ($resultkey =~ /$keyre/) {
       if (ref($$hash{$resultkey})) {      if (ref($$hash{$resultkey})) {
  if ($$hash{$resultkey} =~ /ARRAY/ ) {   if ($$hash{$resultkey} =~ /ARRAY/ ) {
     &Apache::lonxml::debug("$resultkey ---- ".      &Apache::lonxml::debug("$resultkey ---- ".
    &showarray($$hash{$resultkey}));     &showarray($$hash{$resultkey}));
  } elsif ($$hash{$resultkey} =~ /HASH/ ) {   } elsif ($$hash{$resultkey} =~ /HASH/ ) {
     &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");      &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
     &showhashsubset($$hash{$resultkey},'.');      &showhashsubset($$hash{$resultkey},'.');
  } else {   } else {
     &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");      &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
  }   }
       } else {      } else {
  &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");   &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
       }      }
     }   }
   }      }
   &Apache::lonxml::debug("\n<br />restored values^</br>\n");      &Apache::lonxml::debug("\n<br />restored values^</br>\n");
   return '';      return '';
 }  }
   
 sub setuppermissions {  sub setuppermissions {
   $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});      $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
   my $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});      my $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
   if (! $viewgrades &&       if (! $viewgrades && 
       exists($ENV{'request.course.sec'}) &&    exists($ENV{'request.course.sec'}) && 
       $ENV{'request.course.sec'} !~ /^\s*$/) {   $ENV{'request.course.sec'} !~ /^\s*$/) {
       $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}.   $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}.
                                                '/'.$ENV{'request.course.sec'});                                                 '/'.$ENV{'request.course.sec'});
   }      }
   $Apache::lonhomework::viewgrades = $viewgrades;      $Apache::lonhomework::viewgrades = $viewgrades;
   return ''      return ''
 }  }
   
 sub setupheader {  sub setupheader {
     my $request=$_[0];      my $request=$_[0];
     if ($ENV{'browser.mathml'}) {      if ($ENV{'browser.mathml'}) {
  $request->content_type('text/xml');   &Apache::loncommon::content_type($request,'text/xml');
     } else {      } else {
  $request->content_type('text/html');   &Apache::loncommon::content_type($request,'text/html');
     }      }
     $request->content_encoding('UTF-8');  
     if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {      if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {
  &Apache::loncommon::no_cache($request);   &Apache::loncommon::no_cache($request);
     }      }
Line 323  sub setupheader { Line 369  sub setupheader {
 }  }
   
 sub handle_save_or_undo {  sub handle_save_or_undo {
   my ($request,$problem,$result) = @_;      my ($request,$problem,$result) = @_;
   my $file    = &Apache::lonnet::filelocation("",$request->uri);      my $file    = &Apache::lonnet::filelocation("",$request->uri);
   my $filebak =$file.".bak";      my $filebak =$file.".bak";
   my $filetmp =$file.".tmp";      my $filetmp =$file.".tmp";
   my $error=0;  
   
   if ($ENV{'form.Undo'} eq 'undo') {  
     my $error=0;      my $error=0;
     if (!copy($file,$filetmp)) { $error=1; }  
     if ((!$error) && (!copy($filebak,$file))) { $error=1; }      &Apache::lonnet::correct_line_ends($result);
     if ((!$error) && (!move($filetmp,$filebak))) { $error=1; }  
     if (!$error) {      if ($ENV{'form.Undo'} eq &mt('undo')) {
       $request->print("<p><b>Undid changes, Switched $filebak and $file</b></p>");   my $error=0;
     } else {   if (!copy($file,$filetmp)) { $error=1; }
       $request->print("<p><font color=\"red\" size=\"+1\"><b>Unable to undo, unable to switch $filebak and $file</b></font></p>");   if ((!$error) && (!copy($filebak,$file))) { $error=1; }
       $error=1;   if ((!$error) && (!move($filetmp,$filebak))) { $error=1; }
     }   if (!$error) {
   } else {      $request->print("<p><b>".&mt("Undid changes, Switched")." $filebak ".&mt("and")." $file</b></p>");
     my $fs=Apache::File->new(">$filebak");   } else {
     if (defined($fs)) {      $request->print("<p><font color=\"red\" size=\"+1\"><b>".&mt("Unable to undo, unable to switch")." $filebak ".&mt("and")." $file</b></font></p>");
       print $fs $$problem;      $error=1;
       $request->print("<b>Making Backup to $filebak</b><br />");   }
     } else {  
       $request->print("<font color=\"red\" size=\"+1\"><b>Unable to make backup $filebak</b></font>");  
       $error=2;  
     }  
     my $fh=Apache::File->new(">$file");  
     if (defined($fh)) {  
       print $fh $$result;  
       $request->print("<b>Saving Modifications to $file</b><br />");  
     } else {      } else {
       $request->print("<font color=\"red\" size=\"+1\"><b>Unable to write to $file</b></font>");   my $fs=Apache::File->new(">$filebak");
       $error|=4;   if (defined($fs)) {
       print $fs $$problem;
       $request->print("<b>".&mt("Making Backup to").
       " $filebak</b><br />");
    } else {
       $request->print("<font color=\"red\" size=\"+1\"><b>".&mt("Unable to make backup")." $filebak</b></font>");
       $error=2;
    }
    my $fh=Apache::File->new(">$file");
    if (defined($fh)) {
       print $fh $$result;
       $request->print("<b>".&mt("Saving Modifications to").
       " $file</b><br />");
    } else {
       $request->print("<font color=\"red\" size=\"+1\"><b>".
       &mt("Unable to write to")." $file</b></font>");
       $error|=4;
    }
     }      }
   }      return $error;
   return $error;  
 }  }
   
 sub analyze_header {  sub analyze_header {
     my ($request) = @_;      my ($request) = @_;
     my $result.='<html>      my $result.='<html>
             <head><title>Analyzing a problem</title></head>              <head><title>'.&mt("Analyzing a problem").'</title></head>
             <body bgcolor="#FFFFFF">              <body bgcolor="#FFFFFF">
             <form name="lonhomework" method="POST" action="'.              <form name="lonhomework" method="POST" action="'.
       $ENV{'request.uri'}.'">      $ENV{'request.uri'}.'">
             <input type="submit" name="problemmode" value="EditXML" />              <input type="submit" name="problemmode" value="'.&mt("EditXML").'" />
             <input type="submit" name="problemmode" value="Edit" />              <input type="submit" name="problemmode" value="'.&mt('Edit').'" />
             <hr />              <hr />
             <input type="submit" name="submit" value="View" />              <input type="submit" name="submit" value="'.&mt("View").'" />
             <hr />              <hr />
             List of possible answers:              '.&mt('List of possible answers').':
             </form>';              </form>';
     $request->print($result);      $request->print($result);
     $request->rflush();      $request->rflush();
Line 395  sub analyze { Line 446  sub analyze {
     my $rndseed=$ENV{'form.rndseed'};      my $rndseed=$ENV{'form.rndseed'};
     &analyze_header($request);      &analyze_header($request);
     my %prog_state=      my %prog_state=
  &Apache::lonhtmlcommon::Create_PrgWin($request,'Analyze Progress',   &Apache::lonhtmlcommon::Create_PrgWin($request,&mt('Analyze Progress'),
       'Getting Problem Variants',        &mt('Getting Problem Variants'),
       $ENV{'form.numtoanalyze'});        $ENV{'form.numtoanalyze'});
     for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) {      for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) {
  &Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state,   &Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state,
  'last problem');   &mt('last problem'));
  my $subresult=&Apache::lonnet::ssi($request->uri,   my $subresult=&Apache::lonnet::ssi($request->uri,
    ('grade_target' => 'analyze'),     ('grade_target' => 'analyze'),
    ('rndseed' => $i+$rndseed));     ('rndseed' => $i+$rndseed));
Line 421  sub analyze { Line 472  sub analyze {
  }   }
     }      }
     &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,      &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,
   'Analyzing Results');    &mt('Analyzing Results'));
     foreach my $part (sort(keys(%allparts))) {      foreach my $part (sort(keys(%allparts))) {
  if (defined(@{ $overall{$part.'.answer'} })) {   if (defined(@{ $overall{$part.'.answer'} })) {
     my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] });      my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] });
     $request->print('<table><tr><td colspan="'.($num_cols+1).'">Part '.$part.'</td></tr>');      $request->print('<table><tr><td colspan="'.($num_cols+1).'">'.&mt('Part').' '.$part.'</td></tr>');
     my %frequency;      my %frequency;
     foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {      foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {
  $frequency{join("\0",@{ $answer })}++;   $frequency{join("\0",@{ $answer })}++;
     }      }
     $request->print('<tr><td colspan="'.($num_cols).'">Answer</td><td>Frequency</td></tr>');      $request->print('<tr><td colspan="'.($num_cols).'">'.&mt('Answer').'</td><td>'.&mt('Frequency').'</td></tr>');
     foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) {      foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) {
  $request->print('<tr><td align="right">'.   $request->print('<tr><td align="right">'.
  join('</td><td align="right">',split("\0",$answer)).   join('</td><td align="right">',split("\0",$answer)).
Line 439  sub analyze { Line 490  sub analyze {
     }      }
     $request->print('</table>');      $request->print('</table>');
  } else {   } else {
     $request->print('<p>Part '.$part.      $request->print('<p>'.&mt('Part').' '.$part.' '.
     ' is not analyzable at this time</p>');      &mt('is not analyzable at this time').'</p>');
  }   }
     }      }
     if (scalar(keys(%allparts)) == 0 ) {      if (scalar(keys(%allparts)) == 0 ) {
  $request->print('<p>Found no analyzable parts in this problem,   $request->print('<p>'.&mt('Found no analyzable parts in this problem, currently only Numerical, Formula and String response styles are supported.').'</p>');
                          currently only Numerical, Formula and String response  
                          styles are supported.</p>');  
     }      }
     &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state);      &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state);
     &analyze_footer($request);      &analyze_footer($request);
Line 455  sub analyze { Line 504  sub analyze {
 }  }
   
 sub editxmlmode {  sub editxmlmode {
   my ($request,$file) = @_;      my ($request,$file) = @_;
   my $result;      my $result;
   my $problem=&Apache::lonnet::getfile($file);      my $problem=&Apache::lonnet::getfile($file);
   if ($problem eq -1) {      if ($problem eq -1) {
     &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");   &Apache::lonxml::error("<b> ".&mt('Unable to find').
     $problem='';         " <i>$file</i></b>");
   }   $problem='';
   if (defined($ENV{'form.editxmltext'}) || defined($ENV{'form.Undo'})) {      }
     my $error=&handle_save_or_undo($request,\$problem,      if (defined($ENV{'form.editxmltext'}) || defined($ENV{'form.Undo'})) {
    \$ENV{'form.editxmltext'});   my $error=&handle_save_or_undo($request,\$problem,
     if (!$error) { $problem=&Apache::lonnet::getfile($file); }         \$ENV{'form.editxmltext'});
   }   if (!$error) { $problem=&Apache::lonnet::getfile($file); }
   &Apache::lonhomework::showhashsubset(\%ENV,'^form');      }
   if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) {  
     &Apache::lonhomework::showhashsubset(\%ENV,'^form');      &Apache::lonhomework::showhashsubset(\%ENV,'^form');
     $ENV{'form.problemmode'}='View';      if ( $ENV{'form.submit'} eq &mt('Submit Changes and View') ) {
     &renderpage($request,$file);   &Apache::lonhomework::showhashsubset(\%ENV,'^form');
   } else {   $ENV{'form.problemmode'}='View';
     my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);   &renderpage($request,$file);
     my $xml_help = Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index",      } else {
   "Problem Editing Help");   my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
     if ($cols > 80) { $cols = 80; }   my $xml_help = '<table><tr><td>'.
     if ($cols < 70) { $cols = 70; }      &Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index",
     if ($rows < 20) { $rows = 20; }      "Problem Editing Help").
     $result.='<html><body bgcolor="#FFFFFF">      '</td><td>'.
          &Apache::loncommon::help_open_faq(5).
          &Apache::loncommon::help_open_bug('Authoring').'</td></tr></table>';
    if ($cols > 80) { $cols = 80; }
    if ($cols < 70) { $cols = 70; }
    if ($rows < 20) { $rows = 20; }
    $result.='<html><body bgcolor="#FFFFFF">
             <form name="lonhomework" method="POST" action="'.              <form name="lonhomework" method="POST" action="'.
       $ENV{'request.uri'}.'">      $ENV{'request.uri'}.'">
             <input type="hidden" name="problemmode" value="EditXML" />              <input type="hidden" name="problemmode" value="'.&mt('EditXML').'" />
             <input type="submit" name="problemmode" value="Discard Edits and View" />              <input type="submit" name="problemmode" value="'.&mt('Discard Edits and View').'" />
             <input type="submit" name="problemmode" value="Edit" />              <input type="submit" name="problemmode" value="'.&mt('Edit').'" />
             <hr />              <hr />
             <input type="submit" name="submit" value="Submit Changes" />              <input type="submit" name="submit" value="'.&mt('Submit Changes').'" />
             <input type="submit" name="submit" value="Submit Changes and View" />              <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />
             <input type="submit" name="Undo" value="undo" />              <input type="submit" name="Undo" value="'.&mt('undo').'" />
             <hr />              <hr />
             ' . $xml_help . '              ' . $xml_help . '
             <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.              <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
       &HTML::Entities::encode($problem).'</textarea>      &HTML::Entities::encode($problem).'</textarea>
             </form></body></html>';              </form></body></html>';
     $request->print($result);   $request->print($result);
   }      }
   return '';      return '';
 }  }
   
 sub renderpage {  sub renderpage {
   my ($request,$file) = @_;      my ($request,$file) = @_;
   
   my (@targets) = &get_target();      my (@targets) = &get_target();
   &Apache::lonxml::debug("Running targets ".join(':',@targets));      &Apache::lonhomework::showhashsubset(\%ENV,'form.');
   foreach my $target (@targets) {      &Apache::lonxml::debug("Running targets ".join(':',@targets));
     #my $t0 = [&gettimeofday()];      foreach my $target (@targets) {
     my $problem=&Apache::lonnet::getfile($file);   #my $t0 = [&gettimeofday()];
     if ($problem eq -1) {   my $problem=&Apache::lonnet::getfile($file);
       &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");   if ($problem eq -1) {
       $problem='';      &Apache::lonxml::error("<b> ".&mt('Unable to find')." <i>$file</i></b>");
     }      $problem='';
    }
   
     my %mystyle;   my %mystyle;
     my $result = '';   my $result = '';
     if ($target eq 'analyze') { %Apache::lonhomework::analyze=(); }   if ($target eq 'analyze') { %Apache::lonhomework::analyze=(); }
     if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }   if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }
     if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');}   if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');}
   
     &Apache::lonxml::debug("Should be parsing now");   &Apache::lonxml::debug("Should be parsing now");
     $result = &Apache::lonxml::xmlparse($request, $target, $problem,   $result = &Apache::lonxml::xmlparse($request, $target, $problem,
  &setup_vars($target),%mystyle);      &setup_vars($target),%mystyle);
     undef($Apache::lonhomework::parsing_a_problem);   undef($Apache::lonhomework::parsing_a_problem);
     #$request->print("Result follows:");   #$request->print("Result follows:");
     if ($target eq 'modified') {   if ($target eq 'modified') {
       &handle_save_or_undo($request,\$problem,\$result);      &handle_save_or_undo($request,\$problem,\$result);
     } else {   } else {
       if ($target eq 'analyze') {      if ($target eq 'analyze') {
  $result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze);   $result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze);
  undef(%Apache::lonhomework::analyze);   undef(%Apache::lonhomework::analyze);
       }      }
       #my $td=&tv_interval($t0);      #my $td=&tv_interval($t0);
       #if ( $Apache::lonxml::debug) {      #if ( $Apache::lonxml::debug) {
  #$result =~ s:</body>::;      #$result =~ s:</body>::;
  #$result.="<br />Spent $td seconds processing target $target\n</body>";      #$result.="<br />Spent $td seconds processing target $target\n</body>";
       #}      #}
       $request->print($result);      $request->print($result);
       $request->rflush();      $request->rflush();
    }
    #$request->print(":Result ends");
    #my $td=&tv_interval($t0);
     }      }
     #$request->print(":Result ends");  
     #my $td=&tv_interval($t0);  
   }  
 }  }
   
 # with no arg it returns a HTML <option> list of the template titles  # with no arg it returns a HTML <option> list of the template titles
 # with one arg it returns the filename associated with the arg passed  # with one arg it returns the filename associated with the arg passed
 sub get_template_list {  sub get_template_list {
   my ($namewanted,$extension) = @_;      my ($namewanted,$extension) = @_;
   my $result;      my $result;
   my @allnames;      my @allnames;
   &Apache::lonxml::debug("Looking for :$extension:");      &Apache::lonxml::debug("Looking for :$extension:");
   foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {      foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {
     my $name=&Apache::lonnet::metadata($file,'title');   my $name=&Apache::lonnet::metadata($file,'title');
     if ($namewanted && ($name eq $namewanted)) {   if ($namewanted && ($name eq $namewanted)) {
       $result=$file;      $result=$file;
       last;      last;
     } else {   } else {
  if ($name) { push (@allnames, $name); }      if ($name) { push (@allnames, $name); }
    }
     }      }
   }      if (@allnames && !$result) {
   if (@allnames && !$result) {   $result="<option>".&mt("Select a")." $extension ".&mt('template')."</option>\n<option>".
     $result="<option>Select a $extension template</option>\n<option>".      join('</option><option>',sort(@allnames)).'</option>';
  join('</option><option>',sort(@allnames)).'</option>';      }
   }      return $result;
   return $result;  
 }  }
   
 sub newproblem {  sub newproblem {
Line 590  sub newproblem { Line 645  sub newproblem {
  &renderpage($request,$dest);   &renderpage($request,$dest);
     } else {      } else {
  my $url=$request->uri;   my $url=$request->uri;
    my $shownurl=$url;
    $shownurl=~s-^/~-/priv/-;
  my $dest = &Apache::lonnet::filelocation("",$request->uri);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
  my $errormsg;   my $errormsg;
  if ($ENV{'form.newfile'}) {   if ($ENV{'form.newfile'}) {
     $errormsg='<p><font color="red">You did not select a template.</font></p>'."\n";      $errormsg='<p><font color="red">'.&mt('You did not select a template.').'</font></p>'."\n";
  }   }
  my $instructions;   my $instructions;
  if ($templatelist) { $instructions=", select a template from the pull-down menu below.<br />Then";}   my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
    if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'<br />'.&mt("Then");}
    my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new',
     'resource' => 'resource',
     'requested' => 'The requested file',
     'not exist' => 'currently does not exist',
     'createnew' => 'To create a new',
     'click' => 'click on the',
     'Create' => 'Create',
     'button' => 'button');
  $request->print(<<ENDNEWPROBLEM);   $request->print(<<ENDNEWPROBLEM);
 <body bgcolor="#FFFFFF">  $bodytag
 <h1>Creating a new $extension resource</h1>  <h1>$lt{'create'} $extension $lt{'resource'}</h1>
 $errormsg  $errormsg
 The requested file <tt>$url</tt> currently does not exist.  $lt{'requested'} <tt>$shownurl</tt> $lt{'not exist'}.
 <p>  <p>
 <b>To create a new $extension$instructions click on the "Create $extension" button.</b>  <b>$lt{'createnew'} $extension$instructions $lt{'click'} "$lt{'Create'} $extension" $lt{'button'}.</b>
 </p>  </p>
 <p><form action="$url" method="POST">  <p><form action="$url" method="POST">
 ENDNEWPROBLEM  ENDNEWPROBLEM
  if (defined($templatelist)) {   if (defined($templatelist)) {
     $request->print("<select name=\"template\">$templatelist</select>");      $request->print("<select name=\"template\">$templatelist</select>");
  }   }
  $request->print("<br /><input type=\"submit\" name=\"newfile\" value=\"Create $extension\" />");   $request->print("<br /><input type=\"submit\" name=\"newfile\" value=\"".&mt('Create')." $extension\" />");
  $request->print("</form></p></body>");   $request->print("</form></p></body>");
     }      }
     return '';      return '';
 }  }
   
 sub view_or_edit_menu {  sub view_or_edit_menu {
   my ($request) = @_;      my ($request) = @_;
   my $url=$request->uri;      my $url=$request->uri;
   $request->print(<<EDITMENU);      my %lt=&Apache::lonlocal::texthash( 'would' => 'Would you like to',
         'view' => 'View',
         'Edit' => 'edit',
         'or' => 'or',
         'the problem' => 'the problem');
       $request->print(<<EDITMENU);
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF">
 <form action="$url" method="POST">  <form action="$url" method="POST">
 Would you like to <input type="submit" name="problemmode" value="View"> or  $lt{'would'} <input type="submit" name="problemmode" value="&lt{'view'}">
 <input type="submit" name="problemmode" value="Edit"> the problem.  &lt{'or'} <input type="submit" name="problemmode" value="&lt{'Edit'}">
   &lt{'the problem'}.
 </form>  </form>
 </body>  </body>
 EDITMENU  EDITMENU
 }  }
   
 sub handler {  sub handler {
   #my $t0 = [&gettimeofday()];      #my $t0 = [&gettimeofday()];
   my $request=$_[0];      my $request=$_[0];
       
   $Apache::lonxml::debug=$ENV{'user.debug'};      $Apache::lonxml::debug=$ENV{'user.debug'};
       if (&setupheader($request)) { return OK; }
   if (&setupheader($request)) { return OK; }      $ENV{'request.uri'}=$request->uri;
   $ENV{'request.uri'}=$request->uri;  
       #setup permissions
       $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
       $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
       &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
       # some times multiple problemmodes are submitted, need to select
       # the last one
       &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});
       if ( defined($ENV{'form.problemmode'}) &&
    ref($ENV{'form.problemmode'}) ) {
    &Apache::lonxml::debug("Problem Mode ".join(",",@$ENV{'form.problemmode'}));
    my $mode=$ENV{'form.problemmode'}->[-1];
    undef $ENV{'form.problemmode'};
    $ENV{'form.problemmode'}=$mode;
       }
       &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});
       my $file=&Apache::lonnet::filelocation("",$request->uri);
   
       #check if we know where we are
       if ($ENV{'request.course.fn'} && !&Apache::lonnet::symbread()) { 
    # if we are browsing we might not be able to know where we are
    if ($Apache::lonhomework::browse ne 'F') {
       #should know where we are, so ask
       if ( &Apache::lonnet::mod_perl_version() == 2 ) {
    &Apache::lonnet::cleanenv();
       }
       $request->internal_redirect('/adm/ambiguous'); return;
    }
       }
   
   #setup permissions      my ($symb) = &Apache::lonxml::whichuser();
   $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});      &Apache::lonxml::debug('symb is '.$symb);
   $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});      if ($ENV{'request.state'} eq "construct" || $symb eq '') {
   &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");   if ($ENV{'form.resetdata'} eq &mt('Reset Submissions') ||
   # some times multiple problemmodes are submitted, need to select      $ENV{'form.resetdata'} eq &mt('New Problem Variation') ||
   # the last one      $ENV{'form.newrandomization'} eq &mt('New Randomization')) {
   &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});      my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
   if ( defined($ENV{'form.problemmode'}) &&      &Apache::lonnet::tmpreset($symb,'',$domain,$name);
        ref($ENV{'form.problemmode'}) ) {      &Apache::lonxml::debug("Attempt reset");
     &Apache::lonxml::debug("Problem Mode ".join(",",@$ENV{'form.problemmode'}));   }
     my $mode=$ENV{'form.problemmode'}->[-1];      }
     undef $ENV{'form.problemmode'};      if ($ENV{'request.state'} eq "construct") {
     $ENV{'form.problemmode'}=$mode;   if ( -e $file ) {
   }      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
   &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});      ['problemmode']);
   my $file=&Apache::lonnet::filelocation("",$request->uri);      if (!(defined $ENV{'form.problemmode'})) {
    #first visit to problem in construction space
   #check if we know where we are   #&view_or_edit_menu($request);
   if ($ENV{'request.course.fn'} && !&Apache::lonnet::symbread()) {    $ENV{'form.problemmode'}='View';
     # if we are browsing we might not be able to know where we are   &renderpage($request,$file);
     if ($Apache::lonhomework::browse ne 'F') {      } elsif ($ENV{'form.problemmode'} eq &mt('EditXML')) {
       #should know where we are, so ask   &editxmlmode($request,$file);
       } elsif ($ENV{'form.problemmode'} eq &mt('Calculate answers')) {
     &Apache::lonnet::cleanenv();   &analyze($request,$file);
       } else {
  $request->internal_redirect('/adm/ambiguous'); return;   &renderpage($request,$file);
     }      }
   }   } else {
       # requested file doesn't exist in contruction space
   my ($symb) = &Apache::lonxml::whichuser();      &newproblem($request);
   &Apache::lonxml::debug('symb is '.$symb);   }
   if ($ENV{'request.state'} eq "construct" || $symb eq '') {  
       if ($ENV{'form.resetdata'} eq 'Reset Submissions' ||  
   $ENV{'form.resetdata'} eq 'New Problem Variation' ||  
           $ENV{'form.newrandomization'} eq 'New Randomization') {  
   my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();  
   &Apache::lonnet::tmpreset($symb,'',$domain,$name);  
 &Apache::lonxml::debug("Attempt reset");  
       }  
   }  
   if ($ENV{'request.state'} eq "construct") {  
     if ( -e $file ) {  
       &Apache::loncommon::get_unprocessed_cgi  
                           ($ENV{'QUERY_STRING'},['problemmode']);  
       if (!(defined $ENV{'form.problemmode'})) {  
  #first visit to problem in construction space  
  #&view_or_edit_menu($request);  
  $ENV{'form.problemmode'}='View';  
  &renderpage($request,$file);  
       } elsif ($ENV{'form.problemmode'} eq 'EditXML') {  
  &editxmlmode($request,$file);  
       } elsif ($ENV{'form.problemmode'} eq 'Calculate answers') {  
  &analyze($request,$file);  
       } else {  
  &renderpage($request,$file);  
       }  
     } else {      } else {
       # requested file doesn't exist in contruction space   # just render the page normally outside of construction space
       &newproblem($request);   &Apache::lonxml::debug("not construct");
    &renderpage($request,$file);
     }      }
   } else {      #my $td=&tv_interval($t0);
     # just render the page normally outside of construction space      #&Apache::lonxml::debug("Spent $td seconds processing");
     &Apache::lonxml::debug("not construct");      # &Apache::lonhomework::send_footer($request);
     &renderpage($request,$file);      # always turn off debug messages
   }      $Apache::lonxml::debug=0;
   #my $td=&tv_interval($t0);      return OK;
   #&Apache::lonxml::debug("Spent $td seconds processing");  
   # &Apache::lonhomework::send_footer($request);  
   # always turn off debug messages  
   $Apache::lonxml::debug=0;  
   return OK;  
   
 }  }
   
Removed from v.1.141  
changed lines
  Added in v.1.161

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