Diff for /loncom/homework/randomlabel.pm between versions 1.42 and 1.43

version 1.42, 2003/01/23 18:26:10 version 1.43, 2003/02/07 22:03:21
Line 373  sub start_label { Line 373  sub start_label {
   my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);    my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
   if ($target eq 'web' || $target eq 'tex' ||    if ($target eq 'web' || $target eq 'tex' ||
       $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {        $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {
     my $ltext=&Apache::lonxml::get_all_text("/label",$$parser[-1]);      my $ltext=&Apache::lonxml::get_all_text("/label",$parser);
     $ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);      $ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);
     if ($type eq 'image') {      if ($type eq 'image') {
       &Apache::lonxml::debug("Turning $ltext and $Apache::lonxml::pwd[-1]");        &Apache::lonxml::debug("Turning $ltext and $Apache::lonxml::pwd[-1]");
Line 387  sub start_label { Line 387  sub start_label {
     push(@Apache::randomlabel::label_arr,$ltext);      push(@Apache::randomlabel::label_arr,$ltext);
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token,"$type Label");      $result.=&Apache::edit::tag_start($target,$token,"$type Label");
     my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]);      my $text=&Apache::lonxml::get_all_text("/label",$parser);
     if ($type eq 'image') {      if ($type eq 'image') {
       $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();        $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
       $result.=&Apache::edit::text_arg('Description:','description',$token);        $result.=&Apache::edit::text_arg('Description:','description',$token);

Removed from v.1.42  
changed lines
  Added in v.1.43


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