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

Diff for /loncom/homework/randomlabel.pm between versions 1.38 and 1.44

version 1.38, 2002/10/22 21:25:34 version 1.44, 2003/05/06 11:54:08
Line 82  sub check_int { Line 82  sub check_int {
 sub start_randomlabel {  sub start_randomlabel {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';    my $result='';
   push (@Apache::lonxml::extlinks, '/res/adm/includes/GLabel.class');  
   push (@Apache::lonxml::namespace,'randomlabel');    push (@Apache::lonxml::namespace,'randomlabel');
   my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);    my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
   if ( $bgimg !~ /^http:/ ) {    if ( $bgimg !~ /^http:/ ) {
     push (@Apache::lonxml::extlinks,$bgimg);  
     $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);      $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
     if ($bgimg =~ /$Apache::lonnet::perlvar{'lonDocRoot'}/) {      if (&Apache::lonnet::repcopy($bgimg) ne OK) {
       $bgimg=~s/$Apache::lonnet::perlvar{'lonDocRoot'}//;   $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
     } elsif ($bgimg =~ m:^/home/.*/public_html:) {  
       $bgimg =~ s:^/home/(.*)/public_html:/~$1:;  
     }      }
     $bgimg='http://'.$ENV{'SERVER_NAME'}.$bgimg;  
   }    }
   my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);  
   my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);  
   my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));    my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));
   my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));    my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));
   my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);    my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);
   if (!$code) { $code='GLabel.class'; }  
   if (!$codebase) { $codebase='/res/adm/includes/'; }  
   $Apache::randomlabel::tlabel_cnt=0;    $Apache::randomlabel::tlabel_cnt=0;
   $Apache::randomlabel::ilabel_cnt=0;    $Apache::randomlabel::ilabel_cnt=0;
   if ($target eq 'web') {    if ($target eq 'web') {
     $result.="<applet code=\"$code\" codebase=\"$codebase\" width=\"$w\" height=\"$h\">\n";        &Apache::lonxml::startredirection();
     $result.="<param name=\"bgimg\" value=\"$bgimg\">\n";        $result.="BGIMG=".&Apache::lonnet::escape($bgimg);
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
     my $newbgimg = $bgimg;      my $newbgimg = $bgimg;
     $bgimg=~s/(.gif|.jpg)$/.eps/;      $bgimg=~s/\.(gif|jpg|png|jpeg)$/\.eps/i;
     $bgimg= &Apache::lonnet::filelocation($bgimg);      $bgimg= &Apache::lonnet::filelocation($bgimg);
     if (not $ENV{'request.role'}=~/^au\./) {      if (not $ENV{'request.role'}=~/^au\./) {
  $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;   $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;
Line 148  sub start_randomlabel { Line 139  sub start_randomlabel {
     }      }
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);      $result.=&Apache::edit::tag_start($target,$token);
       $Apache::edit::bgimgsrc=
    &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
       $Apache::edit::bgimgsrccurdepth=$Apache::lonxml::curdepth;
     $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';      $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';
     $result.=&Apache::edit::browse('bgimg').' ';      $result.=&Apache::edit::browse('bgimg').' ';
     $result.=&Apache::edit::search('bgimg').'<br />'.      $result.=&Apache::edit::search('bgimg').'<br />'.
Line 173  sub end_randomlabel { Line 167  sub end_randomlabel {
   my $count;    my $count;
   pop @Apache::lonxml::namespace;    pop @Apache::lonxml::namespace;
   if ($target eq 'web') {    if ($target eq 'web') {
     $count = $Apache::randomlabel::tlabel_cnt;        my $args=&Apache::lonxml::endredirection();
     if( $count != 0) { $result.= "<param name=\"COUNT\" value=\"$count\">\n"; }        $args=~s/\s*&/&/g;
     $count = $Apache::randomlabel::ilabel_cnt;        $args=~s/\s*$//;
     if( $count != 0) { $result.= "<param name=\"ICOUNT\" value=\"$count\">\n"; }        $count = $Apache::randomlabel::tlabel_cnt;
     $result .= "</applet>\n<BR />";        if( $count != 0) { $args.= "&COUNT=$count"; }
         $count = $Apache::randomlabel::ilabel_cnt;
         if( $count != 0) { $args.= "&ICOUNT=$count"; }
         my $token=$Apache::lonxml::curdepth.'_'.$$;
         $result.='<img src="/adm/randomlabel.png?token='.$token;
         $result.='" /><br />'."\n";
         &Apache::lonnet::appenv(("imagerequest.$token"=>&Apache::lonnet::escape($args)));
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
       $result='\end{picture}\\\\';        $result='\end{picture}\\\\';
   @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/;    @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/;
Line 279  sub end_labelgroup { Line 279  sub end_labelgroup {
  &Apache::lonxml::error('Unknown type of label :'.$type.':');   &Apache::lonxml::error('Unknown type of label :'.$type.':');
       }        }
       if ($target eq 'web') {        if ($target eq 'web') {
  $result .= '<param name="' . $str  . '" value="'.$label.'">';   $result .= '&'. $str  .'='.&Apache::lonnet::escape($label);
  $result .= '<param name="' . $xstr . '" value="'.$x.'">';   $result .= '&'. $xstr .'='.$x;
  $result .= '<param name="' . $ystr . '" value="'.$y.'">'."\n";   $result .= '&'. $ystr .'='.$y;
       }        }
     }      }
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
Line 348  sub start_location { Line 348  sub start_location {
     $result.=&Apache::edit::tag_start($target,$token);      $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('X:','x',$token,4).      $result.=&Apache::edit::text_arg('X:','x',$token,4).
       &Apache::edit::text_arg('Y:','y',$token,4).        &Apache::edit::text_arg('Y:','y',$token,4).
         &Apache::edit::entercoords('x','y','attribute','width','height').'&nbsp;&nbsp;&nbsp;'.
  &Apache::edit::text_arg('Value:','value',$token).   &Apache::edit::text_arg('Value:','value',$token).
   &Apache::edit::end_row();    &Apache::edit::end_row();
     $result.=&Apache::edit::end_table;      $result.=&Apache::edit::end_table;
Line 376  sub start_label { Line 377  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]");
       $ltext="http://$ENV{'SERVER_NAME'}".&Apache::lonnet::hreflocation($Apache::lonxml::pwd[-1],        $ltext=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],
    $ltext);     $ltext);
       &Apache::lonxml::debug("into $ltext");        &Apache::lonxml::debug("into $ltext");
       my $description = &Apache::lonxml::get_param('description',        my $description = &Apache::lonxml::get_param('description',
Line 390  sub start_label { Line 391  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);
     }      }
     if ($type eq 'text') { $result.="Label Text:"; }      if ($type eq 'text') { $result.="Label Text:"; }
     if ($type eq 'image') { $result.="Path to image:"; }      if ($type eq 'image') { $result.="Path to image:&nbsp;"; }
     $result.=&Apache::edit::editline('',$text,'',20).      $result.=&Apache::edit::editline('',$text,'',50).
       &Apache::edit::end_table();        &Apache::edit::end_table();
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     my $text=$$parser[-1]->get_text("/label");      my $text=$$parser[-1]->get_text("/label");
Removed from v.1.38  
changed lines
  Added in v.1.44

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