Diff for /loncom/homework/lonhomework.pm between versions 1.31 and 1.50

version 1.31, 2001/01/11 15:20:58 version 1.50, 2001/07/18 20:08:34
Line 14  use Apache::response; Line 14  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 {
     &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.submit'}) {      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.submit'}) {        if ( defined $ENV{'form.submitted'}) {
  return ('grade', 'web');   return ('grade', 'web');
       } else {        } else {
  return ('web');   return ('web');
       }        }
     } else {      } else {
       #return ('edit');        if ( $ENV{'form.problemmode'} eq 'View' ) {
       #edit is currently broken   if ( defined $ENV{'form.submitted'}) {
       return ('web');    return ('grade', 'web');
    } else {
     return ('web');
    }
         } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
    if ( $ENV{'form.submitted'} eq 'edit' ) {
     return ('modified','edit');
    } else {
     return ('edit');
    }
         } else {
    return ('web');
         }
     }      }
   }    }
   return ();    return ();
Line 47  sub setup_vars { Line 64  sub setup_vars {
 sub send_header {  sub send_header {
   my ($request)= @_;    my ($request)= @_;
   $request->print(&Apache::lontexconvert::header());    $request->print(&Apache::lontexconvert::header());
   $ENV{'request.uri'}=$request->uri;  
 #  $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 {
     my ($which,$request)=@_;
     if ($which eq 'grade') {
       $request->print('<script language="JavaScript"> 
             hwkmenu=window.open("/res/adm/pages/homeworkmenu.html","homeworkremote",
                    "height=350,width=150,menubar=no");
             </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::lonhomework::date_status=();  $Apache::lonxml::browse='';
 #@Apache::lonhomework::date_msg=();  
 sub check_date {  sub check_date {
   my ($id) = @_;    my ($id) = @_;
   my $date ='';    my $date ='';
Line 95  sub check_date { Line 120  sub check_date {
     $datemsg = "is due at $date";      $datemsg = "is due at $date";
   } elsif ($type eq 'answerdate') {    } elsif ($type eq 'answerdate') {
     $status='CLOSED';      $status='CLOSED';
     $datemsg = "was due as $lastdate, and answers will be available at $date";      $datemsg = "was due on $lastdate, and answers will be available on $date";
   }    }
   if ($status eq 'CAN_ANSWER') {    if ($status eq 'CAN_ANSWER') {
     #check #tries      #check #tries
Line 106  sub check_date { Line 131  sub check_date {
     if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }       if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } 
   }    }
   &Apache::lonxml::debug("sending back :$status:$datemsg:");    &Apache::lonxml::debug("sending back :$status:$datemsg:");
     if (($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED')) {
       &Apache::lonxml::debug("should be allowed to browse a resource when closed");
       $status='CAN_ANSWER';
       $datemsg='is closed but you are allowed to view it';
     }
   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';
Line 114  sub check_date { Line 144  sub check_date {
   return ($status,$datemsg);    return ($status,$datemsg);
 }  }
   
 sub handler {  sub showhash {
   my $request=$_[0];    my (%hash) = @_;
     my $resultkey;
     foreach $resultkey (sort keys %hash) {
       &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");
     }
     &Apache::lonxml::debug("\n<br />restored values^</br>\n");
     return '';
   }
   
   if ( $ENV{'user.name'} eq 'albertel' ) { $Apache::lonxml::debug=1; }  sub setuppermissions {
       $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
   my (@targets) = &get_target();    $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
     return ''
   }
   
   sub setupheader {
     my $request=$_[0];
   if ($ENV{'browser.mathml'}) {    if ($ENV{'browser.mathml'}) {
     $request->content_type('text/xml');      $request->content_type('text/xml');
   } else {    } else {
Line 128  sub handler { Line 169  sub handler {
   }    }
   $request->send_http_header;    $request->send_http_header;
   return OK if $request->header_only;    return OK if $request->header_only;
       return ''
   &Apache::lonhomework::send_header($request);  }
     
   #check if allowed to see  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 {
     my ($request,$file) = @_;
   
     my (@targets) = &get_target();
   foreach my $target (@targets) {    foreach my $target (@targets) {
     my $file=&Apache::lonnet::filelocation("",$request->uri);      #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>");
       $problem='';        $problem='';
     }      }
       
     my %mystyle;      my %mystyle;
     my $result = '';      my $result = '';
     &Apache::inputtags::initialize_inputtags;      &Apache::inputtags::initialize_inputtags;
       &Apache::edit::initialize_edit;
     %Apache::lonhomework::results=();      %Apache::lonhomework::results=();
     %Apache::lonhomework::history=&Apache::lonnet::restore;      %Apache::lonhomework::history=&Apache::lonnet::restore();
     #ignore error conditions      #ignore error conditions
     my ($temp)=keys %Apache::lonhomework::history ;      my ($temp)=keys %Apache::lonhomework::history ;
     if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }       if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); } 
     if ($target eq 'web' && &Apache::lonnet::symbread() eq '') {      if ($target eq 'web') {
       $request->print("Vieiwing this problem as not a student, submissions will be ignored.");        if (&Apache::lonnet::symbread() eq '') {
     }   if ($ENV{'request.state'} eq "construct") {
     if ($target eq 'grade') {    $request->print("In construction space, submissions ignored<br />");
       my $resultkey;   } else {
       foreach $resultkey (sort keys %Apache::lonhomework::history) {    $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");
  &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::history{$resultkey}");   }
       }        }
       &Apache::lonxml::debug("\n<br>restored values^</br>\n");        #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
     }      }
       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>");
Line 168  sub handler { Line 243  sub handler {
  $default.&setup_vars($target),%mystyle);   $default.&setup_vars($target),%mystyle);
   
     #$request->print("Result follows:");      #$request->print("Result follows:");
     $request->print($result);      if ($target eq 'modified') {
         &handle_save_or_undo($request,\$problem,\$result);
       } 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 ends");      #$request->print(":Result ends");
     if ($target eq 'grade') {      if ($target eq 'grade') { &showhash(%Apache::lonhomework::results); }
   
       my $resultkey;      #store new values
       foreach $resultkey (sort keys %Apache::lonhomework::results) {  
  &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::results{$resultkey}");  
       }  
       &Apache::lonxml::debug("\n<br>storing values^</br>\n");  
     }  
       
     my ($temp) = keys %Apache::lonhomework::results;      my ($temp) = keys %Apache::lonhomework::results;
     if ( $temp ne '' ) {      if ( $temp ne '' ) {
       &Apache::lonxml::debug("Store return message:".&Apache::lonnet::cstore(%Apache::lonhomework::results));        &Apache::lonxml::debug("Store return message:".
        &Apache::lonnet::cstore(\%Apache::lonhomework::results));
       }
       #my $td=&tv_interval($t0);
     }
   }
   
   # 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
   sub get_template_list {
     my ($namewanted,$extension) = @_;
     my $result;
     &Apache::lonxml::debug("Looking for :$extension:");
     foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {
       my $name=&Apache::lonnet::metadata($file,'title');
       if ($namewanted && ($name eq $namewanted)) {
         $result=$file;
         last;
       } else {
         $result.="<option>$name</option>";
     }      }
   }    }
   &Apache::lonhomework::send_footer($request);    return $result;
     }
   
   sub newproblem {
     my ($request) = @_;
   
     my $extension=$request->uri;
     $extension=~s:^.*\.([\w]+)$:$1:;
     &Apache::lonxml::debug("Looking for :$extension:");
     if ($ENV{'form.template'}) {
       use File::Copy;
       my $file = &get_template_list($ENV{'form.template'},$extension);
       my $dest = &Apache::lonnet::filelocation("",$request->uri);
       copy($file,$dest);
       &renderpage($request,$file);
     } else {
       my $templatelist=&get_template_list('',$extension);
       my $url=$request->uri;
       my $dest = &Apache::lonnet::filelocation("",$request->uri);
       $request->print(<<ENDNEWPROBLEM);
   <body bgcolor="#FFFFFF">
   The request file $url doesn\'t exist. You can create a new $extension <br />
   <form action="$url" method="POST">
   <input type="submit" value="New $extension"><br />
   <select name="template">
   $templatelist
   </select>
   </form>
   </body>
   ENDNEWPROBLEM
     }
   
     return '';
   }
   
   sub view_or_edit_menu {
     my ($request) = @_;
     my $url=$request->uri;
     $request->print(<<EDITMENU);
   <body bgcolor="#FFFFFF">
   <form action="$url" method="POST">
   Would you like to <input type="submit" name="problemmode" value="View"> or
   <input type="submit" name="problemmode" value="Edit"> the problem.
   </form>
   </body>
   EDITMENU
   }
   
   sub handler {
     #my $t0 = [&gettimeofday()];
     my $request=$_[0];
   
     if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}
   
     if (&setupheader($request)) { return OK; }
     $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:");
   
     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
         $request->internal_redirect('/adm/ambiguous'); return;
       }
     }
   
     if ($ENV{'request.state'} eq "construct") {
       if ( -e $file ) {
         if (!(defined $ENV{'form.problemmode'})) {
    #first visit to problem in construction space
    &view_or_edit_menu($request);
    #&renderpage($request,$file);
         } else {
    &renderpage($request,$file);
         }
       } else {
         # requested file doesn't exist in contruction space
         &newproblem($request);
       }
     } else {
       # just render the page normally outside of construction space
       &renderpage($request,$file);
     }
     #my $td=&tv_interval($t0);
     #&Apache::lonxml::debug("Spent $td seconds processing");
     # &Apache::lonhomework::send_footer($request);
     # always turn off debug messages
     $Apache::lonxml::debug=0;
   return OK;    return OK;
   
 }  }

Removed from v.1.31  
changed lines
  Added in v.1.50


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