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

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

version 1.41, 2002/12/03 10:32:57 version 1.46, 2003/06/19 22:23:10
Line 86  sub start_randomlabel { Line 86  sub start_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:/ ) {
     $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);      $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
       if (&Apache::lonnet::repcopy($bgimg) ne OK) {
    $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
       }
   }    }
   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));
Line 96  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)$/.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\./) {        $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 120  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 136  sub start_randomlabel { Line 135  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 174  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;
   }    }
Line 342  sub start_location { Line 341  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 370  sub start_label { Line 370  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 384  sub start_label { Line 384  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.41  
changed lines
  Added in v.1.46

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