--- loncom/homework/randomlabel.pm 2002/07/22 17:15:55 1.31 +++ loncom/homework/randomlabel.pm 2005/03/16 21:35:17 1.66 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # random labelling tool # -# $Id: randomlabel.pm,v 1.31 2002/07/22 17:15:55 sakharuk Exp $ +# $Id: randomlabel.pm,v 1.66 2005/03/16 21:35:17 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -60,9 +60,14 @@ package Apache::randomlabel; use Apache::lonnet; use strict; use Apache::edit; +use Apache::File(); +use Apache::Constants qw(:common :http); + +my %args; +my $cgi_id; BEGIN { - &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label')); + &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label','bgimg')); } sub check_int { @@ -77,326 +82,345 @@ sub check_int { return $num; } +my ($height_param,$width_param); sub start_randomlabel { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result=''; - push (@Apache::lonxml::extlinks, '/res/adm/includes/GLabel.class'); - push (@Apache::lonxml::namespace,'randomlabel'); - my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval); - if ( $bgimg !~ /^http:/ ) { - push (@Apache::lonxml::extlinks,$bgimg); - $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg); - 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 $code = &Apache::lonxml::get_param('code',$parstack,$safeeval); - my $codebase = &Apache::lonxml::get_param('codebase',$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 $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval); - if (!$code) { $code='GLabel.class'; } - if (!$codebase) { $codebase='/res/adm/includes/'; } - $Apache::randomlabel::tlabel_cnt=0; - $Apache::randomlabel::ilabel_cnt=0; - if ($target eq 'web') { - $result.="\n"; - $result.="\n"; - } elsif ($target eq 'tex') { - $bgimg=~s/(.gif|.jpg)$/.eps/; - $bgimg= &Apache::lonnet::filelocation($bgimg); - if (not $ENV{'request.role'}=~/^au\./) { - $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/; - } else { - $bgimg=~s/http:\/[^\/]*\/~([^\/]+)/\/home\/$1\/public_html/; - - } - $bgimg=~s/\/$//; - if ($texwidth==90) { - $result.='\vspace*{2mm} \noindent \epsfxsize='.$texwidth.' mm \epsffile{'. - $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')'; - } else { - $result.='\vspace*{2mm} \noindent \epsfxsize='.$texwidth.' mm \epsffile{'. - $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')('.(100-$texwidth).','.(100-$texwidth)*$h/$w.')'; - } - } elsif ($target eq 'edit') { - $result.=&Apache::edit::tag_start($target,$token); - $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' '; - $result.=&Apache::edit::browse('bgimg').' '; - $result.=&Apache::edit::search('bgimg').'
'. - &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(); + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + push (@Apache::lonxml::namespace,'randomlabel'); + ($height_param,$width_param)=(0,0); + my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval); + if ( defined($bgimg) && $bgimg !~ /^http:/ ) { + $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'; + } + } + $Apache::randomlabel::obj_cnt=0; + if ($target eq 'web') { + $cgi_id=&Apache::loncommon::get_cgi_id(); + %args=(); + $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg); + } elsif ($target eq 'tex' && defined($bgimg)) { + $result.=&make_eps_image($bgimg,$parstack,$safeeval); + } 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').'
'. + &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; + return $result; } sub end_randomlabel { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result=''; - my $count; - pop @Apache::lonxml::namespace; - if ($target eq 'web') { - $count = $Apache::randomlabel::tlabel_cnt; - if( $count != 0) { $result.= "\n"; } - $count = $Apache::randomlabel::ilabel_cnt; - if( $count != 0) { $result.= "\n"; } - $result .= "\n
"; - } elsif ($target eq 'tex') { - $result='\end{picture}\\\\'; - if (@$parstack[-1]=~/\$texwidth\s*=\s*?"90/) { #" - @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/; - my $howtoskipback = $1/45; - $result.=' \vskip -'.$howtoskipback.' cm '; - } - } elsif ($target eq 'edit') { - $result.=&Apache::edit::end_table; - } - return $result; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + my $count; + pop @Apache::lonxml::namespace; + if ($target eq 'web') { + $count = $Apache::randomlabel::obj_cnt; + if( $count != 0) { $args{"cgi.$cgi_id.OBJCOUNT"}=$count; } + $result.='
'."\n"; + &Apache::lonnet::appenv(%args); + } elsif ($target eq 'tex') { + $result='\end{picture}\\\\'; + $result.= ' \vskip -'.$height_param.' mm } \\\\ '; + } elsif ($target eq 'edit') { + $result.=&Apache::edit::end_table; + } + return $result; +} + +sub start_bgimg { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { + &Apache::lonxml::startredirection(); + } + return $result; +} + +sub end_bgimg { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { + my $bgimg=&Apache::lonxml::endredirection(); + if ($target eq 'web') { + $bgimg=&Apache::imageresponse::clean_up_image($bgimg); + $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg); + } elsif ($target eq 'tex') { + $result.=&make_eps_image($bgimg,$parstack,$safeeval,-2); + } + } + return $result; +} + +sub make_eps_image { + my ($bgimg,$parstack,$safeeval,$depth)=@_; + my ($path,$file) = &Apache::londefdef::get_eps_image($bgimg); + ($height_param,$width_param)= + &Apache::londefdef::image_size($bgimg,0.3,$parstack,$safeeval, + $depth,1); + my $dirtywidth=$width_param+5; + my $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth. + ' mm}{ \noindent \epsfxsize='.$width_param. + ' mm \epsffile{'.$path.$file. + '}\setlength{\unitlength}{1mm} \begin{picture}('. + $width_param.','.$height_param.')(0,-'.$height_param.')'; + return $result; } sub start_labelgroup { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result=''; - my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); - my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval); - $type =~tr/A-Z/a-z/; - if ($target eq 'web' || $target eq 'tex' || - $target eq 'grade' || $target eq 'answer') { - $Apache::randomlabel::groupname=$name; - $Apache::randomlabel::type=$type; - @Apache::randomlabel::xcoord = (); - @Apache::randomlabel::ycoord = (); - @Apache::randomlabel::value = (); - @Apache::randomlabel::label_arr = (); - @Apache::randomlabel::decription = (); - } elsif ($target eq 'edit') { - $result.=&Apache::edit::tag_start($target,$token); - $result.=&Apache::edit::text_arg('Name:','name',$token). - &Apache::edit::select_arg('Type:','type',['text','image'],$token). - &Apache::edit::end_row().&Apache::edit::start_spanning_row(); - } elsif ($target eq 'modified') { - my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, - 'name','type'); - if ($constructtag) { - $result = &Apache::edit::rebuild_tag($token); - $result.=&Apache::edit::handle_insert(); + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); + my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval); + $type =~tr/A-Z/a-z/; + if ($target ne 'modified' && ($name =~ /\W/ || $name =~ /^[0-9]/)) { + &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.
"); + } + if ($target eq 'web' || $target eq 'tex' || + $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') { + $Apache::randomlabel::groupname=$name; + $Apache::randomlabel::type=$type; + @Apache::randomlabel::xcoord = (); + @Apache::randomlabel::ycoord = (); + @Apache::randomlabel::value = (); + @Apache::randomlabel::label_arr = (); + @Apache::randomlabel::decription = (); + } elsif ($target eq 'edit') { + $result.=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::text_arg('Name:','name',$token). + &Apache::edit::select_arg('Type:','type',['text','image'],$token); + if (!defined($token->[2]{'TeXsize'})) { + $token->[2]{'TeXsize'}='\normalsize'; + } + $result.=&Apache::edit::select_arg('TeX font size:','TeXsize', + ['\tiny','\scriptsize', + '\footnotesize','\small', + '\normalsize','\large','\Large', + '\LARGE','\huge','\Huge'], + $token); + $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'name','type', + 'TeXsize'); + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + $result.=&Apache::edit::handle_insert(); + } } - } - return $result; + return $result; } sub add_vars { - my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_; - my $code = '${'.$name."}{'".($order+1)."'}='".$label."';"; - my $out=Apache::run::run($code,$safeeval); - if ($value) { - $code = '${'.$name."}{'value_".($order+1)."'}='".$value."';"; - $out=Apache::run::run($code,$safeeval); - $code = '${'.$name."}{'labelvalue_".($labelorder+1)."'}='".$value."';"; + my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_; + if (!defined($name) || $name eq '') { return; } + my $code = '${'.$name."}{'".($order+1)."'}='".$label."';"; + my $out=Apache::run::run($code,$safeeval); + if ($value) { + $code = '${'.$name."}{'value_".($order+1)."'}='".$value."';"; + $out=Apache::run::run($code,$safeeval); + $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); - } - 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 sub end_labelgroup { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $gname = $Apache::randomlabel::groupname; - my $type = $Apache::randomlabel::type; - my $result=''; - if ($target eq 'web' || $target eq 'answer' || $target eq 'grade') { - my @idx_arr = (0 .. $#Apache::randomlabel::label_arr); - &Apache::structuretags::shuffle(\@idx_arr); - for(0 .. $#Apache::randomlabel::label_arr) { - my $str; - my $xstr; - my $ystr; - my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$_] ]"; - my $x = $Apache::randomlabel::xcoord[$_]; - my $y = $Apache::randomlabel::ycoord[$_]; - my $value = $Apache::randomlabel::value[$_]; - if( $type eq 'text') { - &add_vars($gname,$_,$label,$idx_arr[$_],$value,'',$safeeval); - $str = 'LB'.$Apache::randomlabel::tlabel_cnt; - $xstr = 'X'.$Apache::randomlabel::tlabel_cnt; - $ystr = 'Y'.$Apache::randomlabel::tlabel_cnt; - $Apache::randomlabel::tlabel_cnt += 1; - } elsif ( $type eq 'image') { - &add_vars($gname,$_, - $Apache::randomlabel::description[$idx_arr[$_]], - $idx_arr[$_],$value,$label,$safeeval); - $str = 'IMG'.$Apache::randomlabel::ilabel_cnt; - $xstr = 'IX'.$Apache::randomlabel::ilabel_cnt; - $ystr = 'IY'.$Apache::randomlabel::ilabel_cnt; - $Apache::randomlabel::ilabel_cnt += 1; - } else { - &Apache::lonxml::error('Unknown type of label :'.$type.':'); - } - if ($target eq 'web') { - $result .= ''; - $result .= ''; - $result .= ''."\n"; - } - } - } 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-5)*($texwidth/$wwidth); - #y latex coordinate - my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 ); - my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$ratio; - $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; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $gname = $Apache::randomlabel::groupname; + my $type = $Apache::randomlabel::type; + my $result=''; + if ($target eq 'web' || $target eq 'answer' || $target eq 'grade' || + $target eq 'analyze') { + my @idx_arr = (0 .. $#Apache::randomlabel::label_arr); + &Apache::structuretags::shuffle(\@idx_arr); + for(0 .. $#Apache::randomlabel::label_arr) { + my $str; + my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$_] ]"; + my $x = $Apache::randomlabel::xcoord[$_]; + my $y = $Apache::randomlabel::ycoord[$_]; + my $value = $Apache::randomlabel::value[$_]; + my $i=$Apache::randomlabel::obj_cnt++; + if( $type eq 'text') { + &add_vars($gname,$_,$label,$idx_arr[$_],$value,'',$safeeval); + $str = join(':',$x,$y,&Apache::lonnet::escape($label)); + $args{"cgi.$cgi_id.OBJTYPE"}.='LABEL:'; + } elsif ( $type eq 'image') { + &add_vars($gname,$_, + $Apache::randomlabel::description[$idx_arr[$_]], + $idx_arr[$_],$value,$label,$safeeval); + $str = join(':',$x,$y,&Apache::lonnet::escape($label)); + $args{"cgi.$cgi_id.OBJTYPE"}.='IMAGE:'; + } else { + &Apache::lonxml::error('Unknown type of label :'.$type.':'); + } + if ($target eq 'web') { $args{"cgi.$cgi_id.OBJ$i"} =$str; } + } + } 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 $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval); + if (!defined($TeXsize)) { $TeXsize='\\normalsize'; } + + 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]; + # FIXME the 3.5 here is the 'height' of the letter in TeX + my $y = $Apache::randomlabel::ycoord[$i]-3.5; + my $value = $Apache::randomlabel::value[$i]; + #x latex coordinate + my $tcX=($x)*($width_param/$wwidth); + #y latex coordinate + # my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 ); + my $tcY=$height_param-$y*($height_param/$wheight); + $tcX=sprintf('%.2f',$tcX); + $tcY=sprintf('%.2f',$tcY); + $result.='\put('.$tcX.','.$tcY.'){'.$TeXsize.' \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; } # sub start_location { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - 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 $value= &Apache::lonxml::get_param('value',$parstack,$safeeval); - my $result=''; - push(@Apache::randomlabel::xcoord,$x); - push(@Apache::randomlabel::ycoord,$y); - push(@Apache::randomlabel::value,$value); - if ($target eq 'edit') { - $result.=&Apache::edit::tag_start($target,$token); - $result.=&Apache::edit::text_arg('X:','x',$token,4). - &Apache::edit::text_arg('Y:','y',$token,4). - &Apache::edit::text_arg('Value:','value',$token). - &Apache::edit::end_row(); - $result.=&Apache::edit::end_table; - } elsif ($target eq 'modified') { - my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, - 'x','y','value'); - if ($constructtag) { - $result = &Apache::edit::rebuild_tag($token); - $result.=&Apache::edit::handle_insert(); + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + 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 $value= &Apache::lonxml::get_param('value',$parstack,$safeeval); + my $result=''; + push(@Apache::randomlabel::xcoord,$x); + push(@Apache::randomlabel::ycoord,$y); + push(@Apache::randomlabel::value,$value); + if ($target eq 'edit') { + $result.=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::text_arg('X:','x',$token,4). + &Apache::edit::text_arg('Y:','y',$token,4). + &Apache::edit::entercoords('x','y','attribute','width','height').'   '. + &Apache::edit::text_arg('Value:','value',$token). + &Apache::edit::end_row(); + $result.=&Apache::edit::end_table; + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'x','y','value'); + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + $result.=&Apache::edit::handle_insert(); + } } - } - return $result; + return $result; } sub end_location { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my @result; - if ($target eq 'edit') { @result=('','no') } - return @result; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my @result; + if ($target eq 'edit') { @result=('','no') } + return @result; } # sub start_label { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result=''; - my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2); - if ($target eq 'web' || $target eq 'tex' || - $target eq 'grade' || $target eq 'answer') { - 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); - } elsif ($target eq 'edit') { - $result.=&Apache::edit::tag_start($target,$token,"$type Label"); - my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]); - if ($type eq 'image') { - $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); - $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') { - my $text=$$parser[-1]->get_text("/label"); - $result = '