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

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

version 1.44, 2003/05/06 11:54:08 version 1.46, 2003/06/19 22:23:10
Line 99  sub start_randomlabel { Line 99  sub start_randomlabel {
       &Apache::lonxml::startredirection();        &Apache::lonxml::startredirection();
       $result.="BGIMG=".&Apache::lonnet::escape($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|png|jpeg)$/\.eps/i;        $bgimg=~s/\.(gif|jpg|png|jpeg)$/\.eps/i;
     $bgimg= &Apache::lonnet::filelocation($bgimg);        $bgimg= &Apache::lonnet::filelocation($bgimg);
     if (not $ENV{'request.role'}=~/^au\./) {        $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;
  $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;        $bgimg=~s/\/$//;
  $bgimg=~s/\/$//;        #if no eps file try to replicate it
         #if no eps file try to replicate it        if (not-e $bgimg) {
  if (not-e $bgimg) {    if (&Apache::lonnet::repcopy($bgimg) ne OK ) {
     if (&Apache::lonnet::repcopy($bgimg) ne OK ) {        #if replication failed try to find ps file
  #if replication failed try to find ps file        $bgimg=~s/\.eps$/\.ps/;
  $bgimg=~s/\.eps$/\.ps/;        #if no ps file try to replicate it
  #if no ps file try to replicate it   if (not -e $bgimg &&
  if (not-e $bgimg &&  
     &Apache::lonnet::repcopy($bgimg) ne OK) {      &Apache::lonnet::repcopy($bgimg) ne OK) {
                     #if replication failed try to produce eps file dynamically                      #if replication failed try to produce eps file dynamically
     $bgimg=~s/\.ps$/\.eps/;      $bgimg=~s/\.ps$/\.eps/;
Line 123  sub start_randomlabel { Line 122  sub start_randomlabel {
     $bgimg =~ m/\/([^\/]+)$/;      $bgimg =~ m/\/([^\/]+)$/;
     $bgimg = '/home/httpd/prtspool/'.$1;      $bgimg = '/home/httpd/prtspool/'.$1;
  }   }
     }    }
  }        }
     } else {  
  $bgimg=~s/http:\/[^\/]*\/~([^\/]+)/\/home\/$1\/public_html/;  
     }  
     $bgimg=~s/\/$//;      $bgimg=~s/\/$//;
     my $dirtywidth=$texwidth+5;      my $dirtywidth=$texwidth+5;
     if ($texwidth==90) {      if ($texwidth==90) {
Line 180  sub end_randomlabel { Line 176  sub end_randomlabel {
       &Apache::lonnet::appenv(("imagerequest.$token"=>&Apache::lonnet::escape($args)));        &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*?"(.+)?"/;        my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
       my $one=$1;        my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
   @$parstack[-1]=~/\$width\s*=\s*?"(.+)?"/;        my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval);
       my $two=$1;        my $howtoskipback = $texwidth*$height/$width;
   @$parstack[-1]=~/\$texwidth\s*=\s*?"(.+)?"/;        $result.= ' \vskip -'.$howtoskipback.' mm }  \\\\ ';
       my $three=$1;  
       my $howtoskipback = $three*$one/$two;  
       $result.=' \vskip -'.$howtoskipback.' mm }';  
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table;      $result.=&Apache::edit::end_table;
   }    }
Removed from v.1.44  
changed lines
  Added in v.1.46

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