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

version 1.46, 2003/06/19 22:23:10 version 1.47, 2003/09/08 19:08:57
Line 64  use Apache::File(); Line 64  use Apache::File();
 use Apache::Constants qw(:common :http);  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'));
 }  }
   
 sub check_int {  sub check_int {
Line 80  sub check_int { Line 80  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::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:/ ) {
     $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) {   if (&Apache::lonnet::repcopy($bgimg) ne OK) {
  $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';      $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));      my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);
   my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);      $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') {   &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);   $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
Line 122  sub start_randomlabel { Line 122  sub start_randomlabel {
     $bgimg =~ m/\/([^\/]+)$/;      $bgimg =~ m/\/([^\/]+)$/;
     $bgimg = '/home/httpd/prtspool/'.$1;      $bgimg = '/home/httpd/prtspool/'.$1;
  }   }
   }      }
       }   }
     $bgimg=~s/\/$//;   $bgimg=~s/\/$//;
     my $dirtywidth=$texwidth+5;   my $dirtywidth=$texwidth+5;
     if ($texwidth==90) {   if ($texwidth==90) {
  $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.      $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.')';   $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
     } else {   } else {
  $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.      $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.')';   $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
    }
       } elsif ($target eq 'edit') {
    $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::browse('bgimg').' ';
    $result.=&Apache::edit::search('bgimg').'<br />'.
       &Apache::edit::text_arg('Width(pixel):' ,'width'   ,$token,6).
       &Apache::edit::text_arg('Height(pixel):','height'  ,$token,6).
       &Apache::edit::text_arg('TeXWidth(mm):' ,'texwidth',$token,6).
       &Apache::edit::end_row().&Apache::edit::start_spanning_row();     
       } elsif ($target eq 'modified') {
    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
        $safeeval,'bgimg','width',
        'height','texwidth');
    if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);
       $result.=&Apache::edit::handle_insert();
    }
     }      }
   } elsif ($target eq 'edit') {      return $result;
     $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::browse('bgimg').' ';  
     $result.=&Apache::edit::search('bgimg').'<br />'.  
         &Apache::edit::text_arg('Width(pixel):' ,'width'   ,$token,6).  
         &Apache::edit::text_arg('Height(pixel):','height'  ,$token,6).  
         &Apache::edit::text_arg('TeXWidth(mm):' ,'texwidth',$token,6).  
         &Apache::edit::end_row().&Apache::edit::start_spanning_row();       
   } elsif ($target eq 'modified') {  
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,  
  'bgimg','width','height',  
  'texwidth');  
     if ($constructtag) {  
       $result = &Apache::edit::rebuild_tag($token);  
       $result.=&Apache::edit::handle_insert();  
     }  
   }  
   return $result;  
 }  }
   
 sub end_randomlabel {  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;
   pop @Apache::lonxml::namespace;      pop @Apache::lonxml::namespace;
   if ($target eq 'web') {      if ($target eq 'web') {
       my $args=&Apache::lonxml::endredirection();   my $args=&Apache::lonxml::endredirection();
       $args=~s/\s*&/&/g;   $args=~s/\s*&/&/g;
       $args=~s/\s*$//;   $args=~s/\s*$//;
       $count = $Apache::randomlabel::tlabel_cnt;   $count = $Apache::randomlabel::tlabel_cnt;
       if( $count != 0) { $args.= "&COUNT=$count"; }   if( $count != 0) { $args.= "&COUNT=$count"; }
       $count = $Apache::randomlabel::ilabel_cnt;   $count = $Apache::randomlabel::ilabel_cnt;
       if( $count != 0) { $args.= "&ICOUNT=$count"; }   if( $count != 0) { $args.= "&ICOUNT=$count"; }
       my $token=$Apache::lonxml::curdepth.'_'.$$;   my $token=$Apache::lonxml::curdepth.'_'.$$;
       $result.='<img src="/adm/randomlabel.png?token='.$token;   $result.='<img src="/adm/randomlabel.png?token='.$token;
       $result.='" /><br />'."\n";   $result.='" /><br />'."\n";
       &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}\\\\';
       my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);   my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
       my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);   my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
       my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval);   my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval);
       my $howtoskipback = $texwidth*$height/$width;   my $howtoskipback = $texwidth*$height/$width;
       $result.= ' \vskip -'.$howtoskipback.' mm }  \\\\ ';   $result.= ' \vskip -'.$howtoskipback.' mm }  \\\\ ';
   } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table;   $result.=&Apache::edit::end_table;
   }      }
   return $result;      return $result;
 }  }
   
 sub start_labelgroup {  sub start_labelgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';      my $result='';
   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 'analyze') {   $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 = ();
     @Apache::randomlabel::ycoord = ();   @Apache::randomlabel::ycoord = ();
     @Apache::randomlabel::value = ();   @Apache::randomlabel::value = ();
     @Apache::randomlabel::label_arr  = ();   @Apache::randomlabel::label_arr  = ();
     @Apache::randomlabel::decription  = ();   @Apache::randomlabel::decription  = ();
   } 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('Name:','name',$token).   $result.=&Apache::edit::text_arg('Name:','name',$token).
       &Apache::edit::select_arg('Type:','type',['text','image'],$token).      &Apache::edit::select_arg('Type:','type',['text','image'],$token).
   &Apache::edit::end_row().&Apache::edit::start_spanning_row();      &Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
  'name','type');       $safeeval,'name','type');
     if ($constructtag) {   if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
       $result.=&Apache::edit::handle_insert();      $result.=&Apache::edit::handle_insert();
    }
     }      }
   }      return $result;
   return $result;  
 }  }
   
 sub add_vars {  sub add_vars {
   my ($name,$order,$label,$labelorder,$value,$image,$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) {
     $code = '${'.$name."}{'value_".($order+1)."'}='".$value."';";   $code = '${'.$name."}{'value_".($order+1)."'}='".$value."';";
     $out=Apache::run::run($code,$safeeval);   $out=Apache::run::run($code,$safeeval);
     $code = '${'.$name."}{'labelvalue_".($labelorder+1)."'}='".$value."';";   $code = '${'.$name."}{'labelvalue_".($labelorder+1)."'}='".$value."';";
    $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)."';";
     $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)."';";  
   $out=Apache::run::run($code,$safeeval);  
 }  }
   
 # begin to assign labels to locations  # begin to assign labels to locations
 sub end_labelgroup {  sub end_labelgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   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') {   $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) {
       my $str;      my $str;
       my $xstr;      my $xstr;
       my $ystr;      my $ystr;
       my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$_] ]";      my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$_] ]";
       my $x = $Apache::randomlabel::xcoord[$_];      my $x = $Apache::randomlabel::xcoord[$_];
       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,$_,   &add_vars($gname,$_,
   $Apache::randomlabel::description[$idx_arr[$_]],    $Apache::randomlabel::description[$idx_arr[$_]],
   $idx_arr[$_],$value,$label,$safeeval);    $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;
  $Apache::randomlabel::ilabel_cnt += 1;   $Apache::randomlabel::ilabel_cnt += 1;
       } else {      } else {
  &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  .'='.&Apache::lonnet::escape($label);   $result .= '&'. $str  .'='.&Apache::lonnet::escape($label);
  $result .= '&'. $xstr .'='.$x;   $result .= '&'. $xstr .'='.$x;
  $result .= '&'. $ystr .'='.$y;   $result .= '&'. $ystr .'='.$y;
       }      }
    }
       } elsif ($target eq 'tex') {
    my $WX1=0; #  Web x-coord. of upper left corner (ULC)
    my $WY1=0; #  Web y-coord. of (ULC)
    my $wwidth=&Apache::lonxml::get_param('width',$parstack,$safeeval,-2);
    my $wheight=&Apache::lonxml::get_param('height',$parstack,$safeeval,-2);
    my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2);
    my $TX1=0;
    my $TY1=$texwidth*($wheight/$wwidth);
    my $TX2=$texwidth;
    my $TY2=0;
   
   
    my $slopex=($wwidth-$WX1)/($TX2-$TX1);
    my $slopey=($wheight-$WY1)/($TY2-($TY1-1.0));
    my $cstx=$wwidth-$slopex*($TX2);
    my $csty=$wheight-$slopey*($TY2);
   
    my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);
    &Apache::structuretags::shuffle(\@idx_arr);
   
    &Apache::lonxml::debug("Array is:".$#Apache::randomlabel::label_arr.":");
    for(my $i=0;$i <= $#Apache::randomlabel::label_arr; $i++) {
       my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$i] ]";
       my $x = $Apache::randomlabel::xcoord[$i];
       my $y = $Apache::randomlabel::ycoord[$i];
       my $value = $Apache::randomlabel::value[$i];
       #x latex coordinate
       my $tcX=($x)*($texwidth/$wwidth);
       #y latex coordinate
               #      my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
       my $tcY=$TY1-$y*($TY1/$wheight);
       $tcX=sprintf('%.2f',$tcX);
       $tcY=sprintf('%.2f',$tcY);
       $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
       if( $type eq 'text') {
    &add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval);
       } elsif ( $type eq 'image') {
    &add_vars($gname,$i,
     $Apache::randomlabel::description[$idx_arr[$i]],
     $idx_arr[$i],$value,$label,$safeeval);
       } else {
    &Apache::lonxml::error('Unknown type of label :'.$type.':');
       }
    }
       } elsif ($target eq 'edit') {
    $result.=&Apache::edit::end_table;
     }      }
   } elsif ($target eq 'tex') {      return $result;
     my $WX1=0; #  Web x-coord. of upper left corner (ULC)  
     my $WY1=0; #  Web y-coord. of (ULC)  
     my $wwidth=&Apache::lonxml::get_param('width',$parstack,$safeeval,-2);  
     my $wheight=&Apache::lonxml::get_param('height',$parstack,$safeeval,-2);  
     my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2);  
     my $TX1=0;  
     my $TY1=$texwidth*($wheight/$wwidth);  
     my $TX2=$texwidth;  
     my $TY2=0;  
   
   
     my $slopex=($wwidth-$WX1)/($TX2-$TX1);  
     my $slopey=($wheight-$WY1)/($TY2-($TY1-1.0));  
     my $cstx=$wwidth-$slopex*($TX2);  
     my $csty=$wheight-$slopey*($TY2);  
   
     my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);  
     &Apache::structuretags::shuffle(\@idx_arr);  
   
     &Apache::lonxml::debug("Array is:".$#Apache::randomlabel::label_arr.":");  
     for(my $i=0;$i <= $#Apache::randomlabel::label_arr; $i++) {  
       my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$i] ]";  
       my $x = $Apache::randomlabel::xcoord[$i];  
       my $y = $Apache::randomlabel::ycoord[$i];  
       my $value = $Apache::randomlabel::value[$i];  
       #x latex coordinate  
       my $tcX=($x)*($texwidth/$wwidth);  
       #y latex coordinate  
 #      my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );  
       my $tcY=$TY1-$y*($TY1/$wheight);  
       $tcX=sprintf('%.2f',$tcX);  
       $tcY=sprintf('%.2f',$tcY);  
       $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";  
       if( $type eq 'text') {  
  &add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval);  
       } elsif ( $type eq 'image') {  
  &add_vars($gname,$i,  
   $Apache::randomlabel::description[$idx_arr[$i]],  
   $idx_arr[$i],$value,$label,$safeeval);  
       } else {  
  &Apache::lonxml::error('Unknown type of label :'.$type.':');  
       }  
     }  
   } elsif ($target eq 'edit') {  
     $result.=&Apache::edit::end_table;  
   }  
   return $result;  
 }  }
   
 # <location x="123" y="456" value="some value"/>  # <location x="123" y="456" value="some value"/>
 sub start_location {  sub start_location {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $x= &check_int(&Apache::lonxml::get_param('x',$parstack,$safeeval),50);      my $x= &check_int(&Apache::lonxml::get_param('x',$parstack,$safeeval),50);
   my $y= &check_int(&Apache::lonxml::get_param('y',$parstack,$safeeval),50);      my $y= &check_int(&Apache::lonxml::get_param('y',$parstack,$safeeval),50);
   my $value= &Apache::lonxml::get_param('value',$parstack,$safeeval);      my $value= &Apache::lonxml::get_param('value',$parstack,$safeeval);
   my $result='';      my $result='';
   push(@Apache::randomlabel::xcoord,$x);      push(@Apache::randomlabel::xcoord,$x);
   push(@Apache::randomlabel::ycoord,$y);      push(@Apache::randomlabel::ycoord,$y);
   push(@Apache::randomlabel::value,$value);      push(@Apache::randomlabel::value,$value);
   if ($target eq 'edit') {      if ($target eq 'edit') {
     $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::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;
   } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
  'x','y','value');      $safeeval,'x','y','value');
     if ($constructtag) {   if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
       $result.=&Apache::edit::handle_insert();      $result.=&Apache::edit::handle_insert();
    }
     }      }
   }      return $result;
   return $result;  
 }  }
   
 sub end_location {  sub end_location {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my @result;      my @result;
   if ($target eq 'edit') { @result=('','no') }      if ($target eq 'edit') { @result=('','no') }
   return @result;      return @result;
 }  }
   
 # <label>$var_abc</label>  # <label>$var_abc</label>
 sub start_label {  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 'analyze') {   $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {
     my $ltext=&Apache::lonxml::get_all_text("/label",$parser);   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, $Apache::lonxml::pwd[-1]");
       $ltext=&Apache::lonnet::filelocation($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',
    $parstack,$safeeval);   $parstack,$safeeval);
       push(@Apache::randomlabel::description,$description);      push(@Apache::randomlabel::description,$description);
     }   }
     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);   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().
       $result.=&Apache::edit::text_arg('Description:','description',$token);   &Apache::edit::start_spanning_row();
     }      $result.=&Apache::edit::text_arg('Description:','description',
     if ($type eq 'text') { $result.="Label Text:"; }       $token);
     if ($type eq 'image') { $result.="Path to image:&nbsp;"; }   }
     $result.=&Apache::edit::editline('',$text,'',50).   if ($type eq 'text') { $result.="Label Text:"; }
       &Apache::edit::end_table();   if ($type eq 'image') { $result.="Path to image:&nbsp;"; }
   } elsif ($target eq 'modified') {   $result.=&Apache::edit::editline('',$text,'',50).
     my $text=$$parser[-1]->get_text("/label");      &Apache::edit::end_table();
     $result = '<label>';      } elsif ($target eq 'modified') {
     if ($type eq 'image') {   my $text=$$parser[-1]->get_text("/label");
       my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,   $result = '<label>';
    'description');   if ($type eq 'image') {
       if ($constructtag) {      my $constructtag=&Apache::edit::get_new_args($token,$parstack,
  $result = &Apache::edit::rebuild_tag($token);   $safeeval,
       } else {   'description');
  $result = $token->[4];      if ($constructtag) {
       }   $result = &Apache::edit::rebuild_tag($token);
       } else {
    $result = $token->[4];
       }
    }
    $result.=&Apache::edit::modifiedfield($token);
     }      }
     $result.=&Apache::edit::modifiedfield($token);      return $result;
   }  
   return $result;  
 }  }
   
 sub end_label {  sub end_label {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my @result;      my @result;
   if ($target eq 'edit') { @result=('','no') }      if ($target eq 'edit') { @result=('','no') }
   return @result;      return @result;
 }  }
   
   
   
 1;  1;
 __END__  __END__
     

Removed from v.1.46  
changed lines
  Added in v.1.47


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