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

Diff for /loncom/homework/structuretags.pm between versions 1.52 and 1.54

version 1.52, 2001/08/06 18:33:58 version 1.54, 2001/08/17 14:10:40
Line 2 Line 2
 # definition of tags that give a structure to a document  # definition of tags that give a structure to a document
 # 2/19 Guy  # 2/19 Guy
 # 6/26/2001 fixed extra web display at end of <web></web> tags  # 6/26/2001 fixed extra web display at end of <web></web> tags
   # 8/17 Gerd Kortemeyer
   
 package Apache::structuretags;   package Apache::structuretags; 
   
 use strict;  use strict;
Line 71  sub start_problem { Line 73  sub start_problem {
   $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');    $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
   &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");    &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
   if ($Apache::lonhomework::type eq '') {    if ($Apache::lonhomework::type eq '') {
     $Apache::lonhomework::type='homework';      my $uri=$ENV{'request.uri'};
       if ($uri=~/\.(\w+)$/) {
         $Apache::lonhomework::type=$1;
         &Apache::lonxml::debug("Using type of $1");
       } else {
         $Apache::lonhomework::type='problem';
         &Apache::lonxml::debug("Using default type, problem, :$uri:");
       }
   }    }
 #adeed vars to the scripting enviroment  #adeed vars to the scripting enviroment
   my $expression='$external::part='.$Apache::inputtags::part.';';    my $expression='$external::part='.$Apache::inputtags::part.';';
Line 89  sub start_problem { Line 98  sub start_problem {
     my $expression='$external::datestatus="'.$status.'";';      my $expression='$external::datestatus="'.$status.'";';
     $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';      $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
     &Apache::run::run($expression,$safeeval);      &Apache::run::run($expression,$safeeval);
     if ( $status eq 'CLOSED' ) {      if (( $status eq 'CLOSED' ) ||
           ( $status eq 'UNCHECKEDOUT') ||
           ( $status eq 'BANNED')) {
       my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);        my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
       if ( $target eq "web" ) {        if ( $target eq "web" ) {
  $result.= $head_tag_start.'</head>';   $result.= $head_tag_start.'</head>';
  return $result . $body_tag_start .          my $msg=$body_tag_start.
   " <br />Problem is not open to be viewed. The problem $datemsg<br />";      '<h1>Not open to be viewed</h1>';
           if ($status eq 'CLOSED') {
       $msg.='The problem '.$datemsg;
    } elsif ($status eq 'UNCHECKEDOUT') {
               $msg.='The resource needs to be checked out';
           }
    return $result.$msg.'<br />';
       }        }
     }      }
   }    }
Removed from v.1.52  
changed lines
  Added in v.1.54

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