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

version 1.38, 2002/10/22 21:25:34 version 1.50, 2003/09/25 14:05:44
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::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:/ ) {   $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
     push (@Apache::lonxml::extlinks,$bgimg);   if (&Apache::lonnet::repcopy($bgimg) ne OK) {
     $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);      $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
     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 $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));
   }      my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));
   my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);      my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));
   my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);      if (!$texwidth) { $texwidth=90; }
   my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));      $Apache::randomlabel::tlabel_cnt=0;
   my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));      $Apache::randomlabel::ilabel_cnt=0;
   my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);      if ($target eq 'web') {
   if (!$code) { $code='GLabel.class'; }   &Apache::lonxml::startredirection();
   if (!$codebase) { $codebase='/res/adm/includes/'; }   $result.="BGIMG=".&Apache::lonnet::escape($bgimg);
   $Apache::randomlabel::tlabel_cnt=0;      } elsif ($target eq 'tex') {
   $Apache::randomlabel::ilabel_cnt=0;   my $newbgimg = $bgimg;
   if ($target eq 'web') {   $bgimg=~s/\.(gif|jpg|png|jpeg)$/\.eps/i;
     $result.="<applet code=\"$code\" codebase=\"$codebase\" width=\"$w\" height=\"$h\">\n";   $bgimg= &Apache::lonnet::filelocation($bgimg);
     $result.="<param name=\"bgimg\" value=\"$bgimg\">\n";  
   } elsif ($target eq 'tex') {  
     my $newbgimg = $bgimg;  
     $bgimg=~s/(.gif|.jpg)$/.eps/;  
     $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 134  sub start_randomlabel { Line 125  sub start_randomlabel {
  }   }
     }      }
  }   }
     } else {   $bgimg=~s/\/$//;
  $bgimg=~s/http:\/[^\/]*\/~([^\/]+)/\/home\/$1\/public_html/;   my $dirtywidth=$texwidth+5;
     }   $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{  \noindent \epsfxsize='.
     $bgimg=~s/\/$//;      $texwidth.' mm \epsffile{'.$bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.
     my $dirtywidth=$texwidth+5;      $texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
     if ($texwidth==90) {      } elsif ($target eq 'edit') {
  $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.   $result.=&Apache::edit::tag_start($target,$token);
     $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';   $Apache::edit::bgimgsrc=
     } else {      &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
  $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.   $Apache::edit::bgimgsrccurdepth=$Apache::lonxml::curdepth;
     $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';   $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';
     }   $result.=&Apache::edit::browse('bgimg').' ';
   } elsif ($target eq 'edit') {   $result.=&Apache::edit::search('bgimg').'<br />'.
     $result.=&Apache::edit::tag_start($target,$token);      &Apache::edit::text_arg('Width(pixel):' ,'width'   ,$token,6).
     $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';      &Apache::edit::text_arg('Height(pixel):','height'  ,$token,6).
     $result.=&Apache::edit::browse('bgimg').' ';      &Apache::edit::text_arg('TeXWidth(mm):' ,'texwidth',$token,6).
     $result.=&Apache::edit::search('bgimg').'<br />'.      &Apache::edit::end_row().&Apache::edit::start_spanning_row();     
         &Apache::edit::text_arg('Width(pixel):' ,'width'   ,$token,6).      } elsif ($target eq 'modified') {
         &Apache::edit::text_arg('Height(pixel):','height'  ,$token,6).   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
         &Apache::edit::text_arg('TeXWidth(mm):' ,'texwidth',$token,6).       $safeeval,'bgimg','width',
         &Apache::edit::end_row().&Apache::edit::start_spanning_row();            'height','texwidth');
   } elsif ($target eq 'modified') {   if ($constructtag) {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,      $result = &Apache::edit::rebuild_tag($token);
  'bgimg','width','height',      $result.=&Apache::edit::handle_insert();
  'texwidth');   }
     if ($constructtag) {  
       $result = &Apache::edit::rebuild_tag($token);  
       $result.=&Apache::edit::handle_insert();  
     }      }
   }      return $result;
   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') {
     $count = $Apache::randomlabel::tlabel_cnt;   my $args=&Apache::lonxml::endredirection();
     if( $count != 0) { $result.= "<param name=\"COUNT\" value=\"$count\">\n"; }   $args=~s/\s*&/&/g;
     $count = $Apache::randomlabel::ilabel_cnt;   $args=~s/\s*$//;
     if( $count != 0) { $result.= "<param name=\"ICOUNT\" value=\"$count\">\n"; }   $count = $Apache::randomlabel::tlabel_cnt;
     $result .= "</applet>\n<BR />";   if( $count != 0) { $args.= "&COUNT=$count"; }
   } elsif ($target eq 'tex') {   $count = $Apache::randomlabel::ilabel_cnt;
       $result='\end{picture}\\\\';   if( $count != 0) { $args.= "&ICOUNT=$count"; }
   @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/;   my $token=$Apache::lonxml::curdepth.'_'.$$;
       my $one=$1;   $result.='<img src="/adm/randomlabel.png?token='.$token;
   @$parstack[-1]=~/\$width\s*=\s*?"(.+)?"/;   $result.='" /><br />'."\n";
       my $two=$1;   &Apache::lonnet::appenv(("imagerequest.$token"=>&Apache::lonnet::escape($args)));
   @$parstack[-1]=~/\$texwidth\s*=\s*?"(.+)?"/;      } elsif ($target eq 'tex') {
       my $three=$1;   $result='\end{picture}\\\\';
       my $howtoskipback = $three*$one/$two;   my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
       $result.=' \vskip -'.$howtoskipback.' mm }';   my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
   } elsif ($target eq 'edit') {   my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));
     $result.=&Apache::edit::end_table;          if (!$texwidth) { $texwidth=90; }
   }   my $howtoskipback = $texwidth*$height/$width;
   return $result;   $result.= ' \vskip -'.$howtoskipback.' mm }  \\\\ ';
       } elsif ($target eq 'edit') {
    $result.=&Apache::edit::end_table;
       }
       return $result;
   }
   
   sub adjust_textwidth {
       my $texwidth=shift; 
       my $pagewidth=$ENV{'form.textwidth'};
       $pagewidth=~s/\s*mm\s*$//;
       if ($texwidth>$pagewidth) {$texwidth=$pagewidth;}
       return $texwidth;
 }  }
   
 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 ne 'modified' && ($name =~ /\W/ || $name =~ /^[0-9]/)) {
       $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {   &Apache::lonxml::error("Only _ a-z A-Z and 0-9 are allowed in the name to a labelgroup, and the first character can not be a number.<br />");
     $Apache::randomlabel::groupname=$name;      }
     $Apache::randomlabel::type=$type;      if ($target eq 'web' || $target eq 'tex' ||
     @Apache::randomlabel::xcoord = ();   $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {
     @Apache::randomlabel::ycoord = ();   $Apache::randomlabel::groupname=$name;
     @Apache::randomlabel::value = ();   $Apache::randomlabel::type=$type;
     @Apache::randomlabel::label_arr  = ();   @Apache::randomlabel::xcoord = ();
     @Apache::randomlabel::decription  = ();   @Apache::randomlabel::ycoord = ();
   } elsif ($target eq 'edit') {   @Apache::randomlabel::value = ();
     $result.=&Apache::edit::tag_start($target,$token);   @Apache::randomlabel::label_arr  = ();
     $result.=&Apache::edit::text_arg('Name:','name',$token).   @Apache::randomlabel::decription  = ();
       &Apache::edit::select_arg('Type:','type',['text','image'],$token).      } elsif ($target eq 'edit') {
   &Apache::edit::end_row().&Apache::edit::start_spanning_row();   $result.=&Apache::edit::tag_start($target,$token);
   } elsif ($target eq 'modified') {   $result.=&Apache::edit::text_arg('Name:','name',$token).
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,      &Apache::edit::select_arg('Type:','type',['text','image'],$token).
  'name','type');      &Apache::edit::end_row().&Apache::edit::start_spanning_row();
     if ($constructtag) {      } elsif ($target eq 'modified') {
       $result = &Apache::edit::rebuild_tag($token);   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
       $result.=&Apache::edit::handle_insert();       $safeeval,'name','type');
    if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);
       $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 .= '<param name="' . $str  . '" value="'.$label.'">';   $result .= '&'. $str  .'='.&Apache::lonnet::escape($label);
  $result .= '<param name="' . $xstr . '" value="'.$x.'">';   $result .= '&'. $xstr .'='.$x;
  $result .= '<param name="' . $ystr . '" value="'.$y.'">'."\n";   $result .= '&'. $ystr .'='.$y;
       }      }
     }   }
   } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
     my $WX1=0; #  Web x-coord. of upper left corner (ULC)   my $WX1=0; #  Web x-coord. of upper left corner (ULC)
     my $WY1=0; #  Web y-coord. of (ULC)   my $WY1=0; #  Web y-coord. of (ULC)
     my $wwidth=&Apache::lonxml::get_param('width',$parstack,$safeeval,-2);   my $wwidth=&Apache::lonxml::get_param('width',$parstack,$safeeval,-2);
     my $wheight=&Apache::lonxml::get_param('height',$parstack,$safeeval,-2);   my $wheight=&Apache::lonxml::get_param('height',$parstack,$safeeval,-2);
     my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2);   my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2,1));
     my $TX1=0;   if (!$texwidth) { $texwidth=90; }
     my $TY1=$texwidth*($wheight/$wwidth);   my $TX1=0;
     my $TX2=$texwidth;   my $TY1=$texwidth*($wheight/$wwidth);
     my $TY2=0;   my $TX2=$texwidth;
    my $TY2=0;
   
     my $slopex=($wwidth-$WX1)/($TX2-$TX1);  
     my $slopey=($wheight-$WY1)/($TY2-($TY1-1.0));   my $slopex=($wwidth-$WX1)/($TX2-$TX1);
     my $cstx=$wwidth-$slopex*($TX2);   my $slopey=($wheight-$WY1)/($TY2-($TY1-1.0));
     my $csty=$wheight-$slopey*($TY2);   my $cstx=$wwidth-$slopex*($TX2);
    my $csty=$wheight-$slopey*($TY2);
     my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);  
     &Apache::structuretags::shuffle(\@idx_arr);   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++) {   &Apache::lonxml::debug("Array is:".$#Apache::randomlabel::label_arr.":");
       my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$i] ]";   for(my $i=0;$i <= $#Apache::randomlabel::label_arr; $i++) {
       my $x = $Apache::randomlabel::xcoord[$i];      my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$i] ]";
       my $y = $Apache::randomlabel::ycoord[$i];      my $x = $Apache::randomlabel::xcoord[$i];
       my $value = $Apache::randomlabel::value[$i];      my $y = $Apache::randomlabel::ycoord[$i];
       #x latex coordinate      my $value = $Apache::randomlabel::value[$i];
       my $tcX=($x)*($texwidth/$wwidth);      #x latex coordinate
       #y latex coordinate      my $tcX=($x)*($texwidth/$wwidth);
 #      my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );      #y latex coordinate
       my $tcY=$TY1-$y*($TY1/$wheight);              #      my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
       $tcX=sprintf('%.2f',$tcX);      my $tcY=$TY1-$y*($TY1/$wheight);
       $tcY=sprintf('%.2f',$tcY);      $tcX=sprintf('%.2f',$tcX);
       $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";      $tcY=sprintf('%.2f',$tcY);
       if( $type eq 'text') {      $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
  &add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval);      if( $type eq 'text') {
       } elsif ( $type eq 'image') {   &add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval);
  &add_vars($gname,$i,      } elsif ( $type eq 'image') {
   $Apache::randomlabel::description[$idx_arr[$i]],   &add_vars($gname,$i,
   $idx_arr[$i],$value,$label,$safeeval);    $Apache::randomlabel::description[$idx_arr[$i]],
       } else {    $idx_arr[$i],$value,$label,$safeeval);
  &Apache::lonxml::error('Unknown type of label :'.$type.':');      } else {
       }   &Apache::lonxml::error('Unknown type of label :'.$type.':');
       }
    }
       } elsif ($target eq 'edit') {
    $result.=&Apache::edit::end_table;
     }      }
   } elsif ($target eq 'edit') {      return $result;
     $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::text_arg('Value:','value',$token).      &Apache::edit::entercoords('x','y','attribute','width','height').'&nbsp;&nbsp;&nbsp;'.
   &Apache::edit::end_row();      &Apache::edit::text_arg('Value:','value',$token).
     $result.=&Apache::edit::end_table;      &Apache::edit::end_row();
   } elsif ($target eq 'modified') {   $result.=&Apache::edit::end_table;
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,      } elsif ($target eq 'modified') {
  'x','y','value');   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
     if ($constructtag) {      $safeeval,'x','y','value');
       $result = &Apache::edit::rebuild_tag($token);   if ($constructtag) {
       $result.=&Apache::edit::handle_insert();      $result = &Apache::edit::rebuild_tag($token);
       $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[-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, $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',
    $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[-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().
       $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:"; }   }
     $result.=&Apache::edit::editline('',$text,'',20).   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.38  
changed lines
  Added in v.1.50


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