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

Diff for /loncom/homework/randomlabel.pm between versions 1.39 and 1.41

version 1.39, 2002/11/07 19:48:51 version 1.41, 2002/12/03 10:32:57
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='';
   &Apache::lonxml::startredirection();  
   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'}/) {  
       $bgimg=~s/$Apache::lonnet::perlvar{'lonDocRoot'}//;  
     } 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.='<img src="/cgi-bin/randomlabel.png?';        &Apache::lonxml::startredirection();
     $result.="BGIMG=".&Apache::lonnet::escape('/home/httpd/html/'.$bgimg);        $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)$/.eps/;
     $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 172  sub end_randomlabel { Line 159  sub end_randomlabel {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';    my $result='';
   my $count;    my $count;
   $result=&Apache::lonxml::endredirection();  
   $result=~s/\s*&/&/g;  
   $result=~s/\s*$//;  
   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.= "&COUNT=$count"; }        $args=~s/\s*&/&/g;
     $count = $Apache::randomlabel::ilabel_cnt;        $args=~s/\s*$//;
     if( $count != 0) { $result.= "&ICOUNT=$count"; }        $count = $Apache::randomlabel::tlabel_cnt;
     $result.='" /><br />'."\n";        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 283  sub end_labelgroup { Line 273  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 .= '&'. $str  .'='.$label;   $result .= '&'. $str  .'='.&Apache::lonnet::escape($label);
  $result .= '&'. $xstr .'='.$x;   $result .= '&'. $xstr .'='.$x;
  $result .= '&'. $ystr .'='.$y;   $result .= '&'. $ystr .'='.$y;
       }        }
Line 384  sub start_label { Line 374  sub start_label {
     $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 400  sub start_label { Line 390  sub start_label {
       $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.39  
changed lines
  Added in v.1.41

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