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

version 1.27, 2002/05/17 21:27:44 version 1.38, 2002/10/22 21:25:34
Line 60  package Apache::randomlabel; Line 60  package Apache::randomlabel;
 use Apache::lonnet;  use Apache::lonnet;
 use strict;  use strict;
 use Apache::edit;  use Apache::edit;
   use Apache::File();
   use Apache::Constants qw(:common :http);
   
 BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));    &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));
Line 91  sub start_randomlabel { Line 93  sub start_randomlabel {
     } elsif ($bgimg =~ m:^/home/.*/public_html:) {      } elsif ($bgimg =~ m:^/home/.*/public_html:) {
       $bgimg =~ s:^/home/(.*)/public_html:/~$1:;        $bgimg =~ s:^/home/(.*)/public_html:/~$1:;
     }      }
     $bgimg="http://".$ENV{'SERVER_NAME'}.$bgimg;      $bgimg='http://'.$ENV{'SERVER_NAME'}.$bgimg;
   }    }
   my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);    my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);
   my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);    my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);
Line 106  sub start_randomlabel { Line 108  sub start_randomlabel {
     $result.="<applet code=\"$code\" codebase=\"$codebase\" width=\"$w\" height=\"$h\">\n";      $result.="<applet code=\"$code\" codebase=\"$codebase\" width=\"$w\" height=\"$h\">\n";
     $result.="<param name=\"bgimg\" value=\"$bgimg\">\n";      $result.="<param name=\"bgimg\" value=\"$bgimg\">\n";
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
       my $newbgimg = $bgimg;
     $bgimg=~s/(.gif|.jpg)$/.eps/;      $bgimg=~s/(.gif|.jpg)$/.eps/;
     $bgimg= &Apache::lonnet::filelocation($bgimg);      $bgimg= &Apache::lonnet::filelocation($bgimg);
     $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;      if (not $ENV{'request.role'}=~/^au\./) {
    $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;
    $bgimg=~s/\/$//;
           #if no eps file try to replicate it
    if (not-e $bgimg) {
       if (&Apache::lonnet::repcopy($bgimg) ne OK ) {
    #if replication failed try to find ps file
    $bgimg=~s/\.eps$/\.ps/;
    #if no ps file try to replicate it
    if (not-e $bgimg &&
       &Apache::lonnet::repcopy($bgimg) ne OK) {
                       #if replication failed try to produce eps file dynamically
       $bgimg=~s/\.ps$/\.eps/;
       my $temp_file;
       my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
       $temp_file = Apache::File->new('>>'.$filename);
       $newbgimg =~ s/(.*)\/res\//\/home\/httpd\/html\/res\//;
       print $temp_file "$newbgimg\n";
       $bgimg =~ m/\/([^\/]+)$/;
       $bgimg = '/home/httpd/prtspool/'.$1;
    }
       }
    }
       } else {
    $bgimg=~s/http:\/[^\/]*\/~([^\/]+)/\/home\/$1\/public_html/;
       }
     $bgimg=~s/\/$//;      $bgimg=~s/\/$//;
     $result.='\vspace*{2mm}  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.      my $dirtywidth=$texwidth+5;
     $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}(0,0)('.$texwidth.','.$texwidth*$h/$w.')'      if ($texwidth==90) {
    $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
       $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
       } else {
    $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
       $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
       }
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);      $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';      $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';
Line 145  sub end_randomlabel { Line 179  sub end_randomlabel {
     if( $count != 0) { $result.= "<param name=\"ICOUNT\" value=\"$count\">\n"; }      if( $count != 0) { $result.= "<param name=\"ICOUNT\" value=\"$count\">\n"; }
     $result .= "</applet>\n<BR />";      $result .= "</applet>\n<BR />";
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
     $result='\end{picture}\\\\';        $result='\end{picture}\\\\';
     @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/;
         my $one=$1;
     @$parstack[-1]=~/\$width\s*=\s*?"(.+)?"/;
         my $two=$1;
     @$parstack[-1]=~/\$texwidth\s*=\s*?"(.+)?"/;
         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 158  sub start_labelgroup { Line 200  sub start_labelgroup {
   my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);    my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
   my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);    my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
   $type =~tr/A-Z/a-z/;    $type =~tr/A-Z/a-z/;
   if ($target eq 'web' || $target eq 'tex' ||     if ($target eq 'web' || $target eq 'tex' ||
       $target eq 'grade' || $target eq 'answer') {        $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {
     $Apache::randomlabel::groupname=$name;      $Apache::randomlabel::groupname=$name;
     $Apache::randomlabel::type=$type;      $Apache::randomlabel::type=$type;
     @Apache::randomlabel::xcoord = ();      @Apache::randomlabel::xcoord = ();
Line 184  sub start_labelgroup { Line 226  sub start_labelgroup {
 }  }
   
 sub add_vars {  sub add_vars {
   my ($name,$order,$label,$labelorder,$value,$safeeval) = @_;    my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_;
   my $code = '${'.$name."}{'".($order+1)."'}='".$label."';";    my $code = '${'.$name."}{'".($order+1)."'}='".$label."';";
   my $out=Apache::run::run($code,$safeeval);    my $out=Apache::run::run($code,$safeeval);
   if ($value) {    if ($value) {
Line 193  sub add_vars { Line 235  sub add_vars {
     $code = '${'.$name."}{'labelvalue_".($labelorder+1)."'}='".$value."';";      $code = '${'.$name."}{'labelvalue_".($labelorder+1)."'}='".$value."';";
     $out=Apache::run::run($code,$safeeval);      $out=Apache::run::run($code,$safeeval);
   }    }
     if ($image) {
         my $code = '${'.$name."}{'image_".($order+1)."'}='".$image."';";
         my $out=Apache::run::run($code,$safeeval);
     }
   $code = '${'.$name."}{'numlocations'}='".($order+1)."';";    $code = '${'.$name."}{'numlocations'}='".($order+1)."';";
   $out=Apache::run::run($code,$safeeval);    $out=Apache::run::run($code,$safeeval);
 }  }
Line 203  sub end_labelgroup { Line 249  sub end_labelgroup {
   my $gname = $Apache::randomlabel::groupname;    my $gname = $Apache::randomlabel::groupname;
   my $type  = $Apache::randomlabel::type;    my $type  = $Apache::randomlabel::type;
   my $result='';    my $result='';
   if ($target eq 'web' || $target eq 'answer' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'answer' || $target eq 'grade' ||
         $target eq 'analyze') {
     my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);      my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);
     &Apache::structuretags::shuffle(\@idx_arr);      &Apache::structuretags::shuffle(\@idx_arr);
     for(0 .. $#Apache::randomlabel::label_arr) {      for(0 .. $#Apache::randomlabel::label_arr) {
Line 215  sub end_labelgroup { Line 262  sub end_labelgroup {
       my $y = $Apache::randomlabel::ycoord[$_];        my $y = $Apache::randomlabel::ycoord[$_];
       my $value = $Apache::randomlabel::value[$_];        my $value = $Apache::randomlabel::value[$_];
       if( $type eq 'text') {        if( $type eq 'text') {
  &add_vars($gname,$_,$label,$idx_arr[$_],$value,$safeeval);   &add_vars($gname,$_,$label,$idx_arr[$_],$value,'',$safeeval);
  $str = 'LB'.$Apache::randomlabel::tlabel_cnt;   $str = 'LB'.$Apache::randomlabel::tlabel_cnt;
  $xstr = 'X'.$Apache::randomlabel::tlabel_cnt;   $xstr = 'X'.$Apache::randomlabel::tlabel_cnt;
  $ystr = 'Y'.$Apache::randomlabel::tlabel_cnt;   $ystr = 'Y'.$Apache::randomlabel::tlabel_cnt;
  $Apache::randomlabel::tlabel_cnt += 1;   $Apache::randomlabel::tlabel_cnt += 1;
       } elsif ( $type eq 'image') {        } elsif ( $type eq 'image') {
  &add_vars($gname,$_,$idx_arr[$_],$idx_arr[$_],$value,$safeeval);   &add_vars($gname,$_,
     $Apache::randomlabel::description[$idx_arr[$_]],
     $idx_arr[$_],$value,$label,$safeeval);
  $str = 'IMG'.$Apache::randomlabel::ilabel_cnt;   $str = 'IMG'.$Apache::randomlabel::ilabel_cnt;
  $xstr = 'IX'.$Apache::randomlabel::ilabel_cnt;   $xstr = 'IX'.$Apache::randomlabel::ilabel_cnt;
  $ystr = 'IY'.$Apache::randomlabel::ilabel_cnt;   $ystr = 'IY'.$Apache::randomlabel::ilabel_cnt;
Line 261  sub end_labelgroup { Line 310  sub end_labelgroup {
       my $x = $Apache::randomlabel::xcoord[$i];        my $x = $Apache::randomlabel::xcoord[$i];
       my $y = $Apache::randomlabel::ycoord[$i];        my $y = $Apache::randomlabel::ycoord[$i];
       my $value = $Apache::randomlabel::value[$i];        my $value = $Apache::randomlabel::value[$i];
 #      my $tcX=$x*($texwidth/$wwidth) - $texwidth;        #x latex coordinate
       my $tcX=($x-10)*($texwidth/$wwidth);        my $tcX=($x)*($texwidth/$wwidth);
 #      my $tcY=$TY1-$y*($TY1/$wheight)-2;        #y latex coordinate
       my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );  #      my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
       my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$ratio;        my $tcY=$TY1-$y*($TY1/$wheight);
       $tcX=sprintf('%.2f',$tcX);        $tcX=sprintf('%.2f',$tcX);
       $tcY=sprintf('%.2f',$tcY);        $tcY=sprintf('%.2f',$tcY);
       $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";        $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
       if( $type eq 'text') {        if( $type eq 'text') {
  &add_vars($gname,$i,$label,$idx_arr[$i],$value,$safeeval);   &add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval);
       } elsif ( $type eq 'image') {        } elsif ( $type eq 'image') {
  &add_vars($gname,$i,$idx_arr[$i],$idx_arr[$i],$value,$safeeval);   &add_vars($gname,$i,
     $Apache::randomlabel::description[$idx_arr[$i]],
     $idx_arr[$i],$value,$label,$safeeval);
       } else {        } else {
  &Apache::lonxml::error('Unknown type of label :'.$type.':');   &Apache::lonxml::error('Unknown type of label :'.$type.':');
       }        }
Line 323  sub start_label { Line 374  sub start_label {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';    my $result='';
   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 '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[-1]);
     $ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);      $ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);
     if ($type eq 'image') {      if ($type eq 'image') {

Removed from v.1.27  
changed lines
  Added in v.1.38


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