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

Diff for /loncom/homework/structuretags.pm between versions 1.212 and 1.227.2.2

version 1.212, 2003/10/03 15:27:02 version 1.227.2.2, 2004/02/06 22:38:24
Line 171  sub setup_rndseed { Line 171  sub setup_rndseed {
  if (defined($rndseed) && $rndseed ne int($rndseed)) {   if (defined($rndseed) && $rndseed ne int($rndseed)) {
    $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed));     $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed));
         }          }
  &Apache::lonxml::debug("Setting rndseed to $rndseed");   if ($safeeval) {
  &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);      &Apache::lonxml::debug("Setting rndseed to $rndseed");
       &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
    }
     }      }
     return $rndseed;      return $rndseed;
 }  }
Line 355  sub start_problem { Line 357  sub start_problem {
     }      }
   
     #added vars to the scripting enviroment      #added vars to the scripting enviroment
     my $expression='$external::part='.$Apache::inputtags::part.';';      my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
     &Apache::run::run($expression,$safeeval);      &Apache::run::run($expression,$safeeval);
     my $status;      my $status;
     my $accessmsg;      my $accessmsg;
Line 400  sub start_problem { Line 402  sub start_problem {
  if (( $status eq 'CLOSED' ) ||   if (( $status eq 'CLOSED' ) ||
     ( $status eq 'UNCHECKEDOUT') ||      ( $status eq 'UNCHECKEDOUT') ||
     ( $status eq 'BANNED') ||      ( $status eq 'BANNED') ||
     ( $status eq 'UNAVAILABLE')) {      ( $status eq 'UNAVAILABLE') ||
       ( $status eq 'INVALID_ACCESS')) {
     my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);      my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
     if ( $target eq "web" ) {      if ( $target eq "web" ) {
  $result.= $head_tag_start.'</head>';   $result.= $head_tag_start.'</head>';
Line 410  sub start_problem { Line 413  sub start_problem {
  } else {   } else {
     $result.='<h1>'.&mt('Not open to be viewed').'</h1>';      $result.='<h1>'.&mt('Not open to be viewed').'</h1>';
  }   }
  if ($status eq 'CLOSED') {   if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
     $msg.='The problem '.$accessmsg;      $msg.='The problem '.$accessmsg;
  } elsif ($status eq 'UNCHECKEDOUT') {   } elsif ($status eq 'UNCHECKEDOUT') {
     $msg.=&checkout_msg;      $msg.=&checkout_msg;
Line 426  sub start_problem { Line 429  sub start_problem {
     }      }
  } elsif ($target eq 'web') {   } elsif ($target eq 'web') {
     my $name= &get_resource_name($parstack,$safeeval);      my $name= &get_resource_name($parstack,$safeeval);
     if ($status eq 'CAN_ANSWER') {      $result.="$head_tag_start<title>$name</title></head>
  # create a page header and exit  
  $result.="$head_tag_start<title>$name</title></head>  
               $body_tag_start \n $form_tag_start".                $body_tag_start \n $form_tag_start".
   '<input type="hidden" name="submitted" value="yes" />';        '<input type="hidden" name="submitted" value="yes" />';
  if ($ENV{'request.state'} eq "construct") {      # create a page header and exit
     $result.= &problem_web_to_edit_header($ENV{'form.rndseed'});      if ($ENV{'request.state'} eq "construct") {
  }   $result.= &problem_web_to_edit_header($ENV{'form.rndseed'});
  # if we are viewing someone else preserve that info      }
  if (defined $ENV{'form.grade_symb'}) {      # if we are viewing someone else preserve that info
     foreach my $field ('symb','courseid','domain','username') {      if (defined $ENV{'form.grade_symb'}) {
  $result .= '<input type="hidden" name="grade_'.$field.   foreach my $field ('symb','courseid','domain','username') {
     '" value="'.$ENV{"form.grade_$field"}.'" />'."\n";      $result .= '<input type="hidden" name="grade_'.$field.
     }   '" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
  }   }
     } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER'  
      || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE') {  
  $result.=$head_tag_start.  
     "<title>$name</title></head>\n$body_tag_start\n";  
     }      }
  } elsif ($target eq 'tex') {   } elsif ($target eq 'tex') {
     my $startminipage = '';      my $startminipage = '';
Line 453  sub start_problem { Line 450  sub start_problem {
     }      }
     my $id = $Apache::inputtags::part;      my $id = $Apache::inputtags::part;
     my $weight = &Apache::lonnet::EXT("resource.$id.weight");      my $weight = &Apache::lonnet::EXT("resource.$id.weight");
     my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'keys');      my $packages=&Apache::lonnet::metadata($ENV{'request.uri'},'packages');
     my @allkeys = split /,/,$allkeys;      my @packages = split /,/,$packages;
     my $allow_print_points = 0;      my $allow_print_points = 0;
     foreach my $partial_key (@allkeys) {      foreach my $partial_key (@packages) {
  if ($partial_key=~m/weight/) {   if ($partial_key=~m/^part_0$/) {
     $allow_print_points++;      $allow_print_points=1;
  }   }
     }      }
     my $duedate = &Apache::lonnet::EXT("resource.$id.duedate");       my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); 
Line 499  sub start_problem { Line 496  sub start_problem {
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.   $result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
     &problem_edit_header();      &problem_edit_header();
    $Apache::lonxml::warnings_error_header=
       &mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."<br />";
  my $temp=&Apache::edit::insertlist($target,$token);   my $temp=&Apache::edit::insertlist($target,$token);
  $result.=$temp;   $result.=$temp;
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
Line 518  sub end_problem { Line 517  sub end_problem {
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||      if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
  $target eq 'tex') {   $target eq 'tex') {
  if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&   if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
      $status eq 'CAN_ANSWER' ) {       ($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode)) {
     # if part is zero, no <part>s existed, so we need to the grading      # if part is zero, no <part>s existed, so we need to the grading
     &Apache::inputtags::grade;      &Apache::inputtags::grade;
  } elsif ( ($target eq 'web' || $target eq 'tex') &&   } elsif ( ($target eq 'web' || $target eq 'tex') &&
Line 533  sub end_problem { Line 532  sub end_problem {
     (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||      (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
     ($target eq 'answer') || ($target eq 'tex')      ($target eq 'answer') || ($target eq 'tex')
    ) {     ) {
     if ($status eq 'CAN_ANSWER') {      if ($target ne 'tex' &&
  if ($target ne 'tex' &&   $ENV{'form.answer_output_mode'} ne 'tex') {
     $ENV{'form.answer_output_mode'} ne 'tex') {   $result.="</form></body>\n";
     $result.="</form></body>\n";  
  }  
     } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||  
      $status eq 'UNCHECKEDOUT' ) {  
  if ($target ne 'tex' &&  
     $ENV{'form.answer_output_mode'} ne 'tex') {  
     $result.="</body>\n";  
  }  
     }      }
     if ($target eq 'web') {      if ($target eq 'web') {
  $result.=&Apache::lonxml::xmlend();   $result.=&Apache::lonxml::xmlend();
Line 574  sub end_problem { Line 565  sub end_problem {
     @Apache::inputtags::response=();      @Apache::inputtags::response=();
     $result=&Apache::response::mandatory_part_meta;      $result=&Apache::response::mandatory_part_meta;
  }   }
    $result.=&Apache::response::meta_part_order();
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  &Apache::lonxml::debug("in end_problem with $target, edit");   &Apache::lonxml::debug("in end_problem with $target, edit");
  $result = &problem_edit_footer();   $result = &problem_edit_footer();
Line 939  sub start_part { Line 931  sub start_part {
     $Apache::lonhomework::problemstatus=      $Apache::lonhomework::problemstatus=
  &Apache::lonnet::EXT("resource.$id.problemstatus");   &Apache::lonnet::EXT("resource.$id.problemstatus");
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);      my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
     my $expression='$external::part='.$Apache::inputtags::part.';';      my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
     &Apache::run::run($expression,$safeeval);      &Apache::run::run($expression,$safeeval);
   
     if ($target eq 'meta') {      if ($target eq 'meta') {
  return &Apache::response::mandatory_part_meta;   my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
    return &Apache::response::mandatory_part_meta.
          &Apache::response::meta_parameter_write('display','string',$display,'Part Description');
     } elsif ($target eq 'web' || $target eq 'grade' ||      } elsif ($target eq 'web' || $target eq 'grade' ||
      $target eq 'answer' || $target eq 'tex') {       $target eq 'answer' || $target eq 'tex') {
  if ($hidden) {   if ($hidden) {
Line 954  sub start_part { Line 948  sub start_part {
     my $expression='$external::datestatus="'.$status.'";';      my $expression='$external::datestatus="'.$status.'";';
     $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';      $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.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') ||
    ( $status eq 'UNAVAILABLE') ||
    ( $status eq 'INVALID_ACCESS')) {
  my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);   my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
  if ( $target eq "web" ) {   if ( $target eq "web" ) {
     $result="<br />".&mt('Part is not open to be viewed. It')." $accessmsg<br />";      $result="<br />".&mt('Part is not open to be viewed. It')." $accessmsg<br />";
Line 971  sub start_part { Line 969  sub start_part {
  $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';   $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
     }      }
     my $weight = &Apache::lonnet::EXT("resource.$id.weight");      my $weight = &Apache::lonnet::EXT("resource.$id.weight");
     if ($Apache::lonhomework::type eq 'exam') { $result .= '\fbox{\textit{'.$weight.' pt}}';}      my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'packages');
       my @allkeys = split /,/,$allkeys;
       my $allow_print_points = 0;
       foreach my $partial_key (@allkeys) {
    if ($partial_key=~m/^part_(.*)$/) {
       if ($1 ne '0') {$allow_print_points=1;}
    }
       }
       if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
  }   }
     }      }
  }   }
Line 979  sub start_part { Line 985  sub start_part {
  $result.=&Apache::edit::tag_start($target,$token);   $result.=&Apache::edit::tag_start($target,$token);
  $result.=&Apache::edit::text_arg('Part ID:','id',$token).   $result.=&Apache::edit::text_arg('Part ID:','id',$token).
     &Apache::loncommon::help_open_topic("Part_Tag_Edit_Help").      &Apache::loncommon::help_open_topic("Part_Tag_Edit_Help").
       '&nbsp;&nbsp;'.
   &Apache::edit::text_arg('Displayed Part Description:','display',$token).
  &Apache::edit::end_row().&Apache::edit::start_spanning_row();   &Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args($token,$parstack,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
      $safeeval,'id');       $safeeval,'id','display');
  if ($constructtag) {   if ($constructtag) {
       #limiting ids to only letters numbers, and space
       $token->[2]->{'id'}=~s/[^A-Za-z0-9 ]//gs;
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
     $result.=&Apache::edit::handle_insert();      $result.=&Apache::edit::handle_insert();
  }   }
Line 999  sub end_part { Line 1009  sub end_part {
     my $result='';      my $result='';
     if ( $target eq 'meta' ) {      if ( $target eq 'meta' ) {
  $result='';   $result='';
     } elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER' && !$hidden) {      } elsif ($target eq 'grade' && 
        ($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
        !$hidden) {
  $result=&Apache::inputtags::grade;   $result=&Apache::inputtags::grade;
     } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) {      } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) {
  my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,   my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
Line 1108  sub end_startouttext { Line 1120  sub end_startouttext {
  &Apache::edit::editfield($token->[1],$text,"",80,4);   &Apache::edit::editfield($token->[1],$text,"",80,4);
     }      }
     if ($target eq 'modified') {      if ($target eq 'modified') {
  $text=&Apache::lonxml::get_all_text("endouttext",$parser);   $result='<startouttext />'.&Apache::edit::modifiedfield("endouttext",$parser);
  $result='<startouttext />'.&Apache::edit::modifiedfield();  
     }      }
     if ($target eq 'tex') {      if ($target eq 'tex') {
  $result .= '\noindent ';   $result .= '\noindent ';
Line 1153  sub start_simpleeditbutton { Line 1164  sub start_simpleeditbutton {
     my $result='';      my $result='';
     if (($target eq 'web') &&      if (($target eq 'web') &&
         (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {          (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
         my $url=$ENV{'REQUEST_URI'};          my $url=$ENV{'request.noversionuri'};
         $url=~s/\?.*$//;          $url=~s/\?.*$//;
  $result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.   $result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
                 '<a href="'.$url.'/smpedit">'.&mt('Simple Problem Editor').'</a> - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').                  '<a href="'.$url.'/smpedit">'.&mt('Simple Problem Editor').'</a> - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').
Removed from v.1.212  
changed lines
  Added in v.1.227.2.2

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