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

Diff for /loncom/homework/lonhomework.pm between versions 1.62 and 1.76

version 1.62, 2001/11/05 22:49:14 version 1.76, 2002/04/09 04:46:33
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,8/17,8/18 Gerd Kortemeyer  # 6/1,8/17,8/18 Gerd Kortemeyer
   
 package Apache::lonhomework;  package Apache::lonhomework;
 use strict;  use strict;
 use Apache::style;  use Apache::style();
 use Apache::lonxml;  use Apache::lonxml();
 use Apache::lonnet;  use Apache::lonnet();
 use Apache::inputtags;  use Apache::lonplot();
 use Apache::structuretags;  use Apache::inputtags();
 use Apache::randomlabel;  use Apache::structuretags();
 use Apache::response;  use Apache::randomlabel();
 use Apache::hint;  use Apache::response();
 use Apache::outputtags;  use Apache::hint();
   use Apache::outputtags();
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
   use HTML::Entities();
 #use Time::HiRes qw( gettimeofday tv_interval );  #use Time::HiRes qw( gettimeofday tv_interval );
   
 sub 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") {
       if ( defined($ENV{'form.grade_target'}) 
    && ($Apache::lonhomework::viewgrades == 'F' )) {
         return ($ENV{'form.grade_target'});
       }
     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.grade_target'}) ) {
         return ($ENV{'form.grade_target'});
       }
     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');
Line 97  sub check_access { Line 132  sub check_access {
   my $type;    my $type;
   my $passed;    my $passed;
   &Apache::lonxml::debug("checking for part :$id:");    &Apache::lonxml::debug("checking for part :$id:");
     &Apache::lonxml::debug("time:".time);
   foreach $temp ("opendate","duedate","answerdate") {    foreach $temp ("opendate","duedate","answerdate") {
     $lastdate = $date;      $lastdate = $date;
     $date = &Apache::lonnet::EXT("resource.$id.$temp");      $date = &Apache::lonnet::EXT("resource.$id.$temp");
Line 158  sub showhash { Line 194  sub showhash {
   my (%hash) = @_;    my (%hash) = @_;
   my $resultkey;    my $resultkey;
   foreach $resultkey (sort keys %hash) {    foreach $resultkey (sort keys %hash) {
     &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");      if (ref($hash{$resultkey})) {
         if ($hash{$resultkey} =~ /ARRAY/ ) {
    my $string="$resultkey ---- (";
    foreach my $elm (@{ $hash{$resultkey} }) {
     $string.="$elm,";
    }
    chop($string);
    &Apache::lonxml::debug("$string)");
         } else {
    &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");
         }
       } else {
         &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 '';
Line 177  sub setupheader { Line 226  sub setupheader {
   } else {    } else {
     $request->content_type('text/html');      $request->content_type('text/html');
   }    }
   &Apache::loncommon::no_cache($request);    if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {
       &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 ''
Line 185  sub setupheader { Line 236  sub setupheader {
   
 sub handle_save_or_undo {  sub handle_save_or_undo {
   my ($request,$problem,$result) = @_;    my ($request,$problem,$result) = @_;
   my $fileout = &Apache::lonnet::filelocation("",$request->uri);    my $file    = &Apache::lonnet::filelocation("",$request->uri);
   my $filesave=$fileout.".bak";    my $filebak =$file.".bak";
     my $filetmp =$file.".tmp";
     my $error=0;
   
   if ($ENV{'form.Undo'} eq 'undo') {    if ($ENV{'form.Undo'} eq 'undo') {
     if (copy($filesave,$fileout)) {      my $error=0;
       $request->print("<b>Undid changes, Copied $filesave to $fileout<br /></b>");      if (!copy($file,$filetmp)) { $error=1; }
       if ((!$error) && (!copy($filebak,$file))) { $error=1; }
       if ((!$error) && (!move($filetmp,$filebak))) { $error=1; }
       if (!$error) {
         $request->print("<p><b>Undid changes, Switched $filebak and $file</b></p>");
     } else {      } else {
       $request->print("<font color=\"red\" size=\"+1\"><b>Unable to undo, unable to copy $filesave to $fileout<br /></b></font>");        $request->print("<p><font color=\"red\" size=\"+1\"><b>Unable to undo, unable to switch $filebak and $file</b></font></p>");
         $error=1;
     }      }
   } else {    } else {
     my $fs=Apache::File->new(">$filesave");      my $fs=Apache::File->new(">$filebak");
     if (defined($fs)) {      if (defined($fs)) {
       print $fs $$problem;        print $fs $$problem;
       $request->print("<b>Making Backup to $filesave</b><br />");        $request->print("<b>Making Backup to $filebak</b><br />");
     } else {      } else {
       $request->print("<font color=\"red\" size=\"+1\"><b>Unable to make backup $filesave</b></font>");        $request->print("<font color=\"red\" size=\"+1\"><b>Unable to make backup $filebak</b></font>");
         $error=2;
     }      }
     my $fh=Apache::File->new(">$fileout");      my $fh=Apache::File->new(">$file");
     if (defined($fh)) {      if (defined($fh)) {
       print $fh $$result;        print $fh $$result;
       $request->print("<b>Saving Modifications to $fileout</b><br />");        $request->print("<b>Saving Modifications to $file</b><br />");
     } else {      } else {
       $request->print("<font color=\"red\" size=\"+1\"><b>Unable to write to $fileout</b></font>");        $request->print("<font color=\"red\" size=\"+1\"><b>Unable to write to $file</b></font>");
         $error|=4;
     }      }
   }    }
     return $error;
   }
   
   sub analyze {
     my ($request,$file) = @_;
     &Apache::lonxml::debug("Analyze");
     my $result=&Apache::lonnet::ssi($request->uri,('grade_target' => 'analyze'));
     &Apache::lonxml::debug(":$result:");
     (my $garbage,$result)=split(/_HASH_REF__/,$result,2);
     &showhash(&Apache::lonnet::str2hash($result));
     return $result;
   }
   
   sub editxmlmode {
     my ($request,$file) = @_;
     my $result;
     my $problem=&Apache::lonnet::getfile($file);
     if ($problem == -1) {
       &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");
       $problem='';
     }
     if (defined($ENV{'form.editxmltext'}) || defined($ENV{'form.Undo'})) {
       my $error=&handle_save_or_undo($request,\$problem,
      \$ENV{'form.editxmltext'});
       if (!$error) { $problem=&Apache::lonnet::getfile($file); }
     }
     my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
     if ($cols > 80) { $cols = 80; }
     $result.='<html><body bgcolor="#FFFFFF">
               <form name="lonhomework" method="POST" action="'.
         $ENV{'request.uri'}.'">
               <input type="hidden" name="problemmode" value="EditXML" />
               <input type="submit" name="problemmode" value="View" />
               <input type="submit" name="problemmode" value="Edit" />
               <hr />
               <input type="submit" name="submit" value="Submit Changes" />
               <input type="submit" name="Undo" value="undo" />
               <hr />
               <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
         &HTML::Entities::encode($problem).'</textarea>
               </form></body></html>';
     $request->print($result);
     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));
   foreach my $target (@targets) {    foreach my $target (@targets) {
     #my $t0 = [&gettimeofday()];      #my $t0 = [&gettimeofday()];
     my $problem=&Apache::lonnet::getfile($file);      my $problem=&Apache::lonnet::getfile($file);
Line 228  sub renderpage { Line 332  sub renderpage {
     my $result = '';      my $result = '';
     &Apache::inputtags::initialize_inputtags;      &Apache::inputtags::initialize_inputtags;
     &Apache::edit::initialize_edit;      &Apache::edit::initialize_edit;
       if ($target eq 'analyze') { %Apache::lonhomework::anaylze=(); }
     if ($target eq 'web') {      if ($target eq 'web') {
       if (&Apache::lonnet::symbread() eq '') {        my ($symb)=&Apache::lonxml::whichuser();
         if ($symb eq '') {
  if ($ENV{'request.state'} eq "construct") {   if ($ENV{'request.state'} eq "construct") {
  } 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 237  sub renderpage { Line 343  sub renderpage {
       }        }
       #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }        #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
     }      }
     if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); }      #if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); }
   
     my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');      my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
     if ($default == -1) {      if ($default == -1) {
       &Apache::lonxml::error("<b>Unable to find <i>default_homework.lcpm</i></b>");        &Apache::lonxml::error("<b>Unable to find <i>default_homework.lcpm</i></b>");
       $default='';        $default='';
     }      }
       &Apache::lonxml::debug("Should be parsing now");
     $result = &Apache::lonxml::xmlparse($target, $problem,      $result = &Apache::lonxml::xmlparse($target, $problem,
  $default.&setup_vars($target),%mystyle);   $default.&setup_vars($target),%mystyle);
   
Line 251  sub renderpage { Line 358  sub renderpage {
     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') {
    $result=&Apache::lonnet::hashref2str(\%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>::;
Line 282  sub get_template_list { Line 393  sub get_template_list {
 }  }
   
 sub newproblem {  sub newproblem {
   my ($request) = @_;      my ($request) = @_;
       my $extension=$request->uri;
   my $extension=$request->uri;      $extension=~s:^.*\.([\w]+)$:$1:;
   $extension=~s:^.*\.([\w]+)$:$1:;      &Apache::lonxml::debug("Looking for :$extension:");
   &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'},$extension);
     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,$dest);
     &renderpage($request,$file);      } elsif($ENV{'form.newfile'}) {
   } else {   # I don't like hard-coded filenames but for now, this will work.
     my $templatelist=&get_template_list('',$extension);   use File::Copy;
     my $url=$request->uri;   my $templatefilename = 
     my $dest = &Apache::lonnet::filelocation("",$request->uri);      $request->dir_config('lonIncludes').'/templates/blank.problem';
     $request->print(<<ENDNEWPROBLEM);   &Apache::lonxml::debug("$templatefilename");
    my $dest = &Apache::lonnet::filelocation("",$request->uri);
    copy($templatefilename,$dest);
    &renderpage($request,$dest);
       }else {
    my $templatelist=&get_template_list('',$extension);
    my $url=$request->uri;
    my $dest = &Apache::lonnet::filelocation("",$request->uri);
    if (!defined($templatelist)) {
       # We didn't find a template, so just create a blank problem.
       $request->print(<<ENDNEWPROBLEM);
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF">
 The request file $url doesn\'t exist. You can create a new $extension <br />  The requested file $url doesn\'t exist. You can create a new $extension <br />
   <form action="$url" method="POST">
   <input type="submit" name="newfile" value="New $extension"><br />
   </form>
   </body>
   ENDNEWPROBLEM
               return '';
           }
    $request->print(<<ENDNEWPROBLEM);
   <body bgcolor="#FFFFFF">
   The requested 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 $extension"><br />  <input type="submit" value="New $extension"><br />
 <select name="template">  <select name="template">
Line 308  $templatelist Line 439  $templatelist
 </form>  </form>
 </body>  </body>
 ENDNEWPROBLEM  ENDNEWPROBLEM
   }      }
       return '';
   return '';  
 }  }
   
 sub view_or_edit_menu {  sub view_or_edit_menu {
Line 339  sub handler { Line 469  sub handler {
   $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});    $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
   $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});    $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
   &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");    &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
     # some times multiple problemmodes are submitted, need to select
     # the last one
     if ( defined($ENV{'form.problemmode'}) &&
          defined(@{ $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);    my $file=&Apache::lonnet::filelocation("",$request->uri);
   
   #check if we know where we are    #check if we know where we are
Line 359  sub handler { Line 497  sub handler {
     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
  &view_or_edit_menu($request);   #&view_or_edit_menu($request);
  #&renderpage($request,$file);   $ENV{'form.problemmode'}='View';
    &renderpage($request,$file);
         } elsif ($ENV{'form.problemmode'} eq 'EditXML') {
    &editxmlmode($request,$file);
         } elsif ($ENV{'form.problemmode'} eq 'Answer Distribution') {
    &analyze($request,$file);
       } else {        } else {
  &renderpage($request,$file);   &renderpage($request,$file);
       }        }
Line 370  sub handler { Line 513  sub handler {
     }      }
   } else {    } else {
     # just render the page normally outside of construction space      # just render the page normally outside of construction space
       &Apache::lonxml::debug("not construct");
     &renderpage($request,$file);      &renderpage($request,$file);
   }    }
   #my $td=&tv_interval($t0);    #my $td=&tv_interval($t0);
Removed from v.1.62  
changed lines
  Added in v.1.76

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