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

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

version 1.63, 2001/11/29 18:36:59 version 1.69, 2002/01/17 12:23:31
Line 34  use strict; Line 34  use strict;
 use Apache::style;  use Apache::style;
 use Apache::lonxml;  use Apache::lonxml;
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::lonplot;
 use Apache::inputtags;  use Apache::inputtags;
 use Apache::structuretags;  use Apache::structuretags;
 use Apache::randomlabel;  use Apache::randomlabel;
Line 43  use Apache::outputtags; Line 44  use Apache::outputtags;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 #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 {
Line 203  sub setupheader { Line 208  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 213  sub handle_save_or_undo { Line 220  sub handle_save_or_undo {
   my ($request,$problem,$result) = @_;    my ($request,$problem,$result) = @_;
   my $fileout = &Apache::lonnet::filelocation("",$request->uri);    my $fileout = &Apache::lonnet::filelocation("",$request->uri);
   my $filesave=$fileout.".bak";    my $filesave=$fileout.".bak";
     my $error=0;
   
   if ($ENV{'form.Undo'} eq 'undo') {    if ($ENV{'form.Undo'} eq 'undo') {
     if (copy($filesave,$fileout)) {      if (copy($filesave,$fileout)) {
       $request->print("<b>Undid changes, Copied $filesave to $fileout<br /></b>");        $request->print("<b>Undid changes, Copied $filesave to $fileout<br /></b>");
     } else {      } else {
       $request->print("<font color=\"red\" size=\"+1\"><b>Unable to undo, unable to copy $filesave to $fileout<br /></b></font>");        $request->print("<font color=\"red\" size=\"+1\"><b>Unable to undo, unable to copy $filesave to $fileout<br /></b></font>");
         $error=1;
     }      }
   } else {    } else {
     my $fs=Apache::File->new(">$filesave");      my $fs=Apache::File->new(">$filesave");
Line 227  sub handle_save_or_undo { Line 236  sub handle_save_or_undo {
       $request->print("<b>Making Backup to $filesave</b><br />");        $request->print("<b>Making Backup to $filesave</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 $filesave</b></font>");
         $error=2;
     }      }
     my $fh=Apache::File->new(">$fileout");      my $fh=Apache::File->new(">$fileout");
     if (defined($fh)) {      if (defined($fh)) {
Line 234  sub handle_save_or_undo { Line 244  sub handle_save_or_undo {
       $request->print("<b>Saving Modifications to $fileout</b><br />");        $request->print("<b>Saving Modifications to $fileout</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 $fileout</b></font>");
         $error|=4;
     }      }
   }    }
     return $error;
   }
   
   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">'.
         $problem.'</textarea>
               </form></body></html>';
     $request->print($result);
     return '';
 }  }
   
 sub renderpage {  sub renderpage {
Line 263  sub renderpage { Line 307  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) {
Line 308  sub get_template_list { Line 352  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 334  $templatelist Line 398  $templatelist
 </form>  </form>
 </body>  </body>
 ENDNEWPROBLEM  ENDNEWPROBLEM
   }      }
       return '';
   return '';  
 }  }
   
 sub view_or_edit_menu {  sub view_or_edit_menu {
Line 365  sub handler { Line 428  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:");
     &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 385  sub handler { Line 448  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);
       } else {        } else {
  &renderpage($request,$file);   &renderpage($request,$file);
       }        }
Removed from v.1.63  
changed lines
  Added in v.1.69

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