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

Diff for /loncom/homework/lonhomework.pm between versions 1.89 and 1.90

version 1.89, 2002/09/23 17:29:37 version 1.90, 2002/09/24 12:39:42
Line 59  BEGIN { Line 59  BEGIN {
   
 sub get_target {  sub get_target {
   if ( $ENV{'request.state'} eq "published") {    if ( $ENV{'request.state'} eq "published") {
     if ( defined($ENV{'form.grade_target'})       if ( defined($ENV{'form.grade_target'}  ) 
    && ($ENV{'form.grade_target'} eq 'tex')) {
         return ($ENV{'form.grade_target'});
       } elsif ( defined($ENV{'form.grade_target'}  ) 
  && ($Apache::lonhomework::viewgrades == 'F' )) {   && ($Apache::lonhomework::viewgrades == 'F' )) {
       return ($ENV{'form.grade_target'});        return ($ENV{'form.grade_target'});
     }      }
    
     if ( defined($ENV{'form.submitted'})) {      if ( defined($ENV{'form.submitted'})) {
       return ('grade', 'web');        return ('grade', 'web');
     } else {      } else {
Line 121  sub createmenu { Line 125  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>');
   }    }
Line 200  sub check_access { Line 204  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='is closed but you are allowed to view it';
   }    }
Line 389  sub renderpage { Line 393  sub renderpage {
     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');}
   
     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");      &Apache::lonxml::debug("Should be parsing now");
Line 425  sub get_template_list { Line 429  sub get_template_list {
   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;
Line 500  sub handler { Line 505  sub handler {
   #my $t0 = [&gettimeofday()];    #my $t0 = [&gettimeofday()];
   my $request=$_[0];    my $request=$_[0];
   
   if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}  #  if ( $ENV{'user.name'} eq 'physnet' ) {$Apache::lonxml::debug=1;}
   
   if (&setupheader($request)) { return OK; }    if (&setupheader($request)) { return OK; }
   $ENV{'request.uri'}=$request->uri;    $ENV{'request.uri'}=$request->uri;
Removed from v.1.89  
changed lines
  Added in v.1.90

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