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

version 1.7, 2001/10/26 18:47:43 version 1.38, 2002/10/22 21:25:34
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # random labelling tool  # random labelling tool
   #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
 # 7/20/2001 Isaac Tsai, initial syntax  # 7/20/2001 Isaac Tsai, initial syntax
 # 8/10/2001 Isaac Tsai,   # 8/10/2001 Isaac Tsai, 
 # 8/30/2001 Isaac Tsai,   # 8/30/2001 Isaac Tsai, 
Line 32 Line 57
 #             (21,54)  : $GroupTwo[2] = "TEXT-2"  #             (21,54)  : $GroupTwo[2] = "TEXT-2"
 #  ===========================================  #  ===========================================
 package Apache::randomlabel;  package Apache::randomlabel;
   use Apache::lonnet;
 use strict;  use strict;
   use Apache::edit;
   use Apache::File();
   use Apache::Constants qw(:common :http);
   
 sub BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));    &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));
 }  }
   
   sub check_int {
       # utility function to do error checking on a integer.
       my ($num,$default) = @_;
       $default = 100 if (! defined($default));
       $num =~ s/\s+//g;  # We dont need no stinkin white space!
       # If it is a real, just grab the integer part.
       ($num,undef) = split (/\./,$num) if ($num =~ /\./); 
       # set to default if what we have left doesn't match anything...
       $num = $default unless ($num =~/^\d+$/);
       return $num;
   }
   
 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='';
   $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=    push (@Apache::lonxml::extlinks, '/res/adm/includes/GLabel.class');
     '/res/adm/includes/GLabel.class';    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:/ ) {
     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$bgimg;      push (@Apache::lonxml::extlinks,$bgimg);
     $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);      $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
     if ($bgimg =~ /$Apache::lonnet::perlvar{'lonDocRoot'}/) {      if ($bgimg =~ /$Apache::lonnet::perlvar{'lonDocRoot'}/) {
       $bgimg=~s/$Apache::lonnet::perlvar{'lonDocRoot'}//;        $bgimg=~s/$Apache::lonnet::perlvar{'lonDocRoot'}//;
     } 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);
   my $w= &Apache::lonxml::get_param('width',$parstack,$safeeval);    my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));
   my $h= &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);
   if (!$code) { $code='GLabel.class'; }    if (!$code) { $code='GLabel.class'; }
   if (!$codebase) { $codebase='/res/adm/includes/'; }    if (!$codebase) { $codebase='/res/adm/includes/'; }
   $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') {
     $result.="<applet code=\"$code\" codebase=\"$codebase\" width=\"$w\" height=\"$h\">";      $result.="<applet code=\"$code\" codebase=\"$codebase\" width=\"$w\" height=\"$h\">\n";
     $result.="<param name=\"bgimg\" value=\"$bgimg\">";      $result.="<param name=\"bgimg\" value=\"$bgimg\">\n";
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
     $bgimg=~s/(.gif|.jpg)$/.ps/;      my $newbgimg = $bgimg;
     $result.='\vspace*{2mm} \\ \noindent \epsfxsize='.$texwidth.' \epsffile{'.      $bgimg=~s/(.gif|.jpg)$/.eps/;
       $bgimg.'}\setlength{\unitlength}{1mm} \\ \begin{picture}(0,0)(0,-5)';      $bgimg= &Apache::lonnet::filelocation($bgimg);
       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/\/$//;
       my $dirtywidth=$texwidth+5;
       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).'<br />'.      $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';
       &Apache::edit::text_arg('Width(pixel):','width',$token,4).      $result.=&Apache::edit::browse('bgimg').' ';
  &Apache::edit::text_arg('Height(pixel):','height',$token,4).      $result.=&Apache::edit::search('bgimg').'<br />'.
   &Apache::edit::text_arg('TeXWidth(mm):','texwidth',$token,4).          &Apache::edit::text_arg('Width(pixel):' ,'width'   ,$token,6).
     '</td></tr><tr><td colspan="3">';          &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') {    } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
  'bgimg','width','height',   'bgimg','width','height',
Line 95  sub end_randomlabel { Line 171  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;
   
   if ($target eq 'web') {    if ($target eq 'web') {
     $count = $Apache::randomlabel::tlabel_cnt;      $count = $Apache::randomlabel::tlabel_cnt;
     if( $count != 0) { $result.= "<param name=\"count\" value=\"$count\">"; }      if( $count != 0) { $result.= "<param name=\"COUNT\" value=\"$count\">\n"; }
     $count = $Apache::randomlabel::ilabel_cnt;      $count = $Apache::randomlabel::ilabel_cnt;
     if( $count != 0) { $result.= "<param name=\"icount\" value=\"$count\">"; }      if( $count != 0) { $result.= "<param name=\"ICOUNT\" value=\"$count\">\n"; }
     $result .= "</applet><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 117  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 = ();
     @Apache::randomlabel::ycoord = ();      @Apache::randomlabel::ycoord = ();
     @Apache::randomlabel::value = ();      @Apache::randomlabel::value = ();
     @Apache::randomlabel::label_arr  = ();      @Apache::randomlabel::label_arr  = ();
       @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).
  '</td></tr><tr><td colspan="3">';    &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,$safeeval,
  'name','type');   'name','type');
Line 142  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 151  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 161  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 173  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,$_,
  $str = 'LB'.$Apache::randomlabel::ilabel_cnt;    $Apache::randomlabel::description[$idx_arr[$_]],
  $xstr = 'X'.$Apache::randomlabel::ilabel_cnt;    $idx_arr[$_],$value,$label,$safeeval);
  $ystr = 'Y'.$Apache::randomlabel::ilabel_cnt;   $str = 'IMG'.$Apache::randomlabel::ilabel_cnt;
    $xstr = 'IX'.$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.':');
Line 190  sub end_labelgroup { Line 281  sub end_labelgroup {
       if ($target eq 'web') {        if ($target eq 'web') {
  $result .= '<param name="' . $str  . '" value="'.$label.'">';   $result .= '<param name="' . $str  . '" value="'.$label.'">';
  $result .= '<param name="' . $xstr . '" value="'.$x.'">';   $result .= '<param name="' . $xstr . '" value="'.$x.'">';
  $result .= '<param name="' . $ystr . '" value="'.$y.'">';   $result .= '<param name="' . $ystr . '" value="'.$y.'">'."\n";
       }        }
     }      }
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
Line 219  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);        #x latex coordinate
       my $tcY=$TY1-$y*($TY1/$wheight)-2;        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);        $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 241  sub end_labelgroup { Line 337  sub end_labelgroup {
 # <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= &Apache::lonxml::get_param('x',$parstack,$safeeval);    my $x= &check_int(&Apache::lonxml::get_param('x',$parstack,$safeeval),50);
   my $y= &Apache::lonxml::get_param('y',$parstack,$safeeval);    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);
Line 253  sub start_location { Line 349  sub start_location {
     $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::text_arg('Value:','value',$token).
  '</td></tr><tr><td colspan="3">';    &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,$safeeval,
Line 277  sub end_location { Line 373  sub end_location {
 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='';
   if ($target eq 'web' || $target eq 'tex' ||     my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
       $target eq 'grade' || $target eq 'answer') {    if ($target eq 'web' || $target eq 'tex' ||
         $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]);
       if ($type eq 'image') {
         &Apache::lonxml::debug("Turning $ltext and $Apache::lonxml::pwd[-1]");
         $ltext="http://$ENV{'SERVER_NAME'}".&Apache::lonnet::hreflocation($Apache::lonxml::pwd[-1],
      $ltext);
         &Apache::lonxml::debug("into $ltext");
         my $description = &Apache::lonxml::get_param('description',
      $parstack,$safeeval);
         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);      $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[-1]);
     $result.='</td></tr><tr><td colspan="3">'.      if ($type eq 'image') {
       &Apache::edit::editfield('',$text,'',20,1).        $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
  &Apache::edit::end_table();        $result.=&Apache::edit::text_arg('Description:','description',$token);
       }
       if ($type eq 'text') { $result.="Label Text:"; }
       if ($type eq 'image') { $result.="Path to image:"; }
       $result.=&Apache::edit::editline('',$text,'',20).
         &Apache::edit::end_table();
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     my $text=$$parser[-1]->get_text("/label");      my $text=$$parser[-1]->get_text("/label");
       $result = '<label>';
       if ($type eq 'image') {
         my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
      'description');
         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;

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


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