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

Diff for /loncom/homework/lonhomework.pm between versions 1.46 and 1.63

version 1.46, 2001/06/12 22:42:55 version 1.63, 2001/11/29 18:36:59
Line 1 Line 1
   # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler  # The LON-CAPA Homework handler
   #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
 # Guy Albertelli  # Guy Albertelli
 # 11/30 Gerd Kortemeyer  # 11/30 Gerd Kortemeyer
 # 6/1 Gerd Kortemeyer  # 6/1,8/17,8/18 Gerd Kortemeyer
   
 package Apache::lonhomework;  package Apache::lonhomework;
 use strict;  use strict;
Line 10  use Apache::lonxml; Line 36  use Apache::lonxml;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::inputtags;  use Apache::inputtags;
 use Apache::structuretags;  use Apache::structuretags;
   use Apache::randomlabel;
 use Apache::response;  use Apache::response;
 use Apache::hint;  use Apache::hint;
 use Apache::outputtags;  use Apache::outputtags;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
   #use Time::HiRes qw( gettimeofday tv_interval );
   
 sub BEGIN {  sub BEGIN {
   &Apache::lonxml::register_insert();    &Apache::lonxml::register_insert();
Line 22  sub BEGIN { Line 49  sub BEGIN {
   
 sub get_target {  sub get_target {
   if ( $ENV{'request.state'} eq "published") {    if ( $ENV{'request.state'} eq "published") {
     if ( defined $ENV{'form.submitted'}) {      if ( defined($ENV{'form.submitted'})) {
       return ('grade', 'web');        return ('grade', 'web');
     } else {      } else {
       return ('web');        return ('web');
     }      }
   } elsif ($ENV{'request.state'} eq "construct") {    } elsif ($ENV{'request.state'} eq "construct") {
     if ( defined $ENV{'form.preview'}) {      if ( defined($ENV{'form.preview'})) {
       if ( defined $ENV{'form.submitted'}) {        if ( defined($ENV{'form.submitted'})) {
  return ('grade', 'web');   return ('grade', 'web');
       } else {        } else {
  return ('web');   return ('web');
       }        }
     } else {      } else {
       if ( $ENV{'form.problemmode'} eq 'View' ) {        if ( $ENV{'form.problemmode'} eq 'View' ) {
  if ( defined $ENV{'form.submitted'}) {   if ( defined($ENV{'form.submitted'}) &&
   return ('grade', 'web');       (!defined($ENV{'form.resetdata'})) ) {
     return ('grade', 'web','answer');
  } else {   } else {
   return ('web');    return ('web','answer');
  }   }
       } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {        } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
  if ( $ENV{'form.submitted'} eq 'edit' ) {   if ( $ENV{'form.submitted'} eq 'edit' ) {
Line 84  sub send_footer { Line 112  sub send_footer {
 }  }
   
 $Apache::lonxml::browse='';  $Apache::lonxml::browse='';
 sub check_date {  
   sub check_access {
   my ($id) = @_;    my ($id) = @_;
   my $date ='';    my $date ='';
   my $status = '';    my $status = '';
Line 130  sub check_date { Line 159  sub check_date {
     if ( $maxtries eq '' ) { $maxtries = '2'; }       if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }       if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } 
   }    }
   
     if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
         (!$Apache::lonhomework::history{"resource.0.outtoken"})) {
         return ('UNCHECKEDOUT','needs to be checked out');
     }
   
   
   &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");
Line 167  sub setupheader { Line 203  sub setupheader {
   } else {    } else {
     $request->content_type('text/html');      $request->content_type('text/html');
   }    }
     &Apache::loncommon::no_cache($request);
   $request->send_http_header;    $request->send_http_header;
   return OK if $request->header_only;    return OK if $request->header_only;
   return ''    return ''
 }  }
   
   sub handle_save_or_undo {
     my ($request,$problem,$result) = @_;
     my $fileout = &Apache::lonnet::filelocation("",$request->uri);
     my $filesave=$fileout.".bak";
   
     if ($ENV{'form.Undo'} eq 'undo') {
       if (copy($filesave,$fileout)) {
         $request->print("<b>Undid changes, Copied $filesave to $fileout<br /></b>");
       } else {
         $request->print("<font color=\"red\" size=\"+1\"><b>Unable to undo, unable to copy $filesave to $fileout<br /></b></font>");
       }
     } else {
       my $fs=Apache::File->new(">$filesave");
       if (defined($fs)) {
         print $fs $$problem;
         $request->print("<b>Making Backup to $filesave</b><br />");
       } else {
         $request->print("<font color=\"red\" size=\"+1\"><b>Unable to make backup $filesave</b></font>");
       }
       my $fh=Apache::File->new(">$fileout");
       if (defined($fh)) {
         print $fh $$result;
         $request->print("<b>Saving Modifications to $fileout</b><br />");
       } else {
         $request->print("<font color=\"red\" size=\"+1\"><b>Unable to write to $fileout</b></font>");
       }
     }
   }
   
 sub renderpage {  sub renderpage {
   my ($request,$file) = @_;    my ($request,$file) = @_;
   
   my (@targets) = &get_target();    my (@targets) = &get_target();
   foreach my $target (@targets) {    foreach my $target (@targets) {
       #my $t0 = [&gettimeofday()];
     my $problem=&Apache::lonnet::getfile($file);      my $problem=&Apache::lonnet::getfile($file);
     if ($problem == -1) {      if ($problem == -1) {
       &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");        &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");
Line 187  sub renderpage { Line 254  sub renderpage {
     my $result = '';      my $result = '';
     &Apache::inputtags::initialize_inputtags;      &Apache::inputtags::initialize_inputtags;
     &Apache::edit::initialize_edit;      &Apache::edit::initialize_edit;
     %Apache::lonhomework::results=();  
     %Apache::lonhomework::history=&Apache::lonnet::restore();  
     #ignore error conditions  
     my ($temp)=keys %Apache::lonhomework::history ;  
     if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }   
     if ($target eq 'web') {      if ($target eq 'web') {
       if (&Apache::lonnet::symbread() eq '') {        if (&Apache::lonnet::symbread() eq '') {
  if ($ENV{'request.state'} eq "construct") {   if ($ENV{'request.state'} eq "construct") {
   $request->print("In construction space, submissions ignored<br />");  
  } else {   } else {
   $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");    $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");
  }   }
Line 214  sub renderpage { Line 275  sub renderpage {
   
     #$request->print("Result follows:");      #$request->print("Result follows:");
     if ($target eq 'modified') {      if ($target eq 'modified') {
       my $fileout = &Apache::lonnet::filelocation("",$request->uri);        &handle_save_or_undo($request,\$problem,\$result);
       my $filesave=$fileout.".bak";  
   
       my $fs=Apache::File->new(">$filesave");  
       print $fs $problem;  
       $request->print("<b>Making Backup to $filesave</b><br />");  
   
       my $fh=Apache::File->new(">$fileout");  
       print $fh $result;  
       $request->print("<b>Saving Modifications to $fileout</b><br />");  
     } else {      } else {
         #my $td=&tv_interval($t0);
         #if ( $Apache::lonxml::debug) {
    #$result =~ s:</body>::;
    #$result.="<br />Spent $td seconds processing target $target\n</body>";
         #}
       $request->print($result);        $request->print($result);
     }      }
     #$request->print(":Result ends");      #$request->print(":Result ends");
     if ($target eq 'grade') { &showhash(%Apache::lonhomework::results); }      #my $td=&tv_interval($t0);
   
     #store new values  
     my ($temp) = keys %Apache::lonhomework::results;  
     if ( $temp ne '' ) {  
       &Apache::lonxml::debug("Store return message:".  
      &Apache::lonnet::cstore(\%Apache::lonhomework::results));  
     }  
   }    }
 }  }
   
 # 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) = @_;    my ($namewanted,$extension) = @_;
   my $result;    my $result;
   foreach my $file (</home/httpd/html/res/adm/includes/templates/*.problem>) {    &Apache::lonxml::debug("Looking for :$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;
Line 259  sub get_template_list { Line 310  sub get_template_list {
 sub newproblem {  sub newproblem {
   my ($request) = @_;    my ($request) = @_;
   
     my $extension=$request->uri;
     $extension=~s:^.*\.([\w]+)$:$1:;
     &Apache::lonxml::debug("Looking for :$extension:");
   if ($ENV{'form.template'}) {    if ($ENV{'form.template'}) {
     use File::Copy;      use File::Copy;
     my $file = &get_template_list($ENV{'form.template'});      my $file = &get_template_list($ENV{'form.template'},$extension);
     my $dest = &Apache::lonnet::filelocation("",$request->uri);      my $dest = &Apache::lonnet::filelocation("",$request->uri);
     copy($file,$dest);      copy($file,$dest);
     &renderpage($request,$file);      &renderpage($request,$file);
   } else {    } else {
     my $templatelist=&get_template_list();      my $templatelist=&get_template_list('',$extension);
     my $url=$request->uri;      my $url=$request->uri;
       my $dest = &Apache::lonnet::filelocation("",$request->uri);
     $request->print(<<ENDNEWPROBLEM);      $request->print(<<ENDNEWPROBLEM);
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF">
 The request file $url doesn\'t exist. You can create a new problem <br />  The request file $url doesn\'t exist. You can create a new $extension <br />
 <form action="$url" method="POST">  <form action="$url" method="POST">
 <input type="submit" value="New Problem"><br />  <input type="submit" value="New $extension"><br />
 <select name="template">  <select name="template">
 $templatelist  $templatelist
 </select>  </select>
Line 298  EDITMENU Line 353  EDITMENU
 }  }
   
 sub handler {  sub handler {
     #my $t0 = [&gettimeofday()];
   my $request=$_[0];    my $request=$_[0];
   
   #if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}    if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}
   
   if (&setupheader($request)) { return OK; }    if (&setupheader($request)) { return OK; }
   $ENV{'request.uri'}=$request->uri;    $ENV{'request.uri'}=$request->uri;
Line 322  sub handler { Line 378  sub handler {
   }    }
   
   if ($ENV{'request.state'} eq "construct") {    if ($ENV{'request.state'} eq "construct") {
       if ($ENV{'form.resetdata'} eq 'Reset Submissions') {
         my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
         &Apache::lonnet::tmpreset($symb,'',$domain,$name);
       }
     if ( -e $file ) {      if ( -e $file ) {
       if (!(defined $ENV{'form.problemmode'})) {        if (!(defined $ENV{'form.problemmode'})) {
  #first visit to problem in construction space   #first visit to problem in construction space
Line 338  sub handler { Line 398  sub handler {
     # just render the page normally outside of construction space      # just render the page normally outside of construction space
     &renderpage($request,$file);      &renderpage($request,$file);
   }    }
     #my $td=&tv_interval($t0);
     #&Apache::lonxml::debug("Spent $td seconds processing");
   # &Apache::lonhomework::send_footer($request);    # &Apache::lonhomework::send_footer($request);
   # always turn off debug messages    # always turn off debug messages
   $Apache::lonxml::debug=0;    $Apache::lonxml::debug=0;
Removed from v.1.46  
changed lines
  Added in v.1.63

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