--- loncom/homework/randomlabel.pm 2002/10/22 21:25:34 1.38 +++ loncom/homework/randomlabel.pm 2003/06/19 22:23:10 1.46 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # random labelling tool # -# $Id: randomlabel.pm,v 1.38 2002/10/22 21:25:34 sakharuk Exp $ +# $Id: randomlabel.pm,v 1.46 2003/06/19 22:23:10 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -82,45 +82,35 @@ sub check_int { 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:; + if (&Apache::lonnet::repcopy($bgimg) ne OK) { + $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif'; } - $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"; + &Apache::lonxml::startredirection(); + $result.="BGIMG=".&Apache::lonnet::escape($bgimg); } 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/\/$//; - #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 && + my $newbgimg = $bgimg; + $bgimg=~s/\.(gif|jpg|png|jpeg)$/\.eps/i; + $bgimg= &Apache::lonnet::filelocation($bgimg); + $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/; @@ -132,11 +122,8 @@ sub start_randomlabel { $bgimg =~ m/\/([^\/]+)$/; $bgimg = '/home/httpd/prtspool/'.$1; } - } - } - } else { - $bgimg=~s/http:\/[^\/]*\/~([^\/]+)/\/home\/$1\/public_html/; - } + } + } $bgimg=~s/\/$//; my $dirtywidth=$texwidth+5; if ($texwidth==90) { @@ -148,6 +135,9 @@ sub start_randomlabel { } } 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').'
'. @@ -173,21 +163,24 @@ sub end_randomlabel { 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
"; + my $args=&Apache::lonxml::endredirection(); + $args=~s/\s*&/&/g; + $args=~s/\s*$//; + $count = $Apache::randomlabel::tlabel_cnt; + if( $count != 0) { $args.= "&COUNT=$count"; } + $count = $Apache::randomlabel::ilabel_cnt; + if( $count != 0) { $args.= "&ICOUNT=$count"; } + my $token=$Apache::lonxml::curdepth.'_'.$$; + $result.='
'."\n"; + &Apache::lonnet::appenv(("imagerequest.$token"=>&Apache::lonnet::escape($args))); } elsif ($target eq 'tex') { $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 }'; + my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval); + my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval); + my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval); + my $howtoskipback = $texwidth*$height/$width; + $result.= ' \vskip -'.$howtoskipback.' mm } \\\\ '; } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; } @@ -279,9 +272,9 @@ sub end_labelgroup { &Apache::lonxml::error('Unknown type of label :'.$type.':'); } if ($target eq 'web') { - $result .= ''; - $result .= ''; - $result .= ''."\n"; + $result .= '&'. $str .'='.&Apache::lonnet::escape($label); + $result .= '&'. $xstr .'='.$x; + $result .= '&'. $ystr .'='.$y; } } } elsif ($target eq 'tex') { @@ -348,6 +341,7 @@ sub start_location { $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; @@ -376,11 +370,11 @@ sub start_label { my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2); 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); $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::lonnet::filelocation($Apache::lonxml::pwd[-1], $ltext); &Apache::lonxml::debug("into $ltext"); my $description = &Apache::lonxml::get_param('description', @@ -390,14 +384,14 @@ sub start_label { 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]); + my $text=&Apache::lonxml::get_all_text("/label",$parser); 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). + if ($type eq 'image') { $result.="Path to image: "; } + $result.=&Apache::edit::editline('',$text,'',50). &Apache::edit::end_table(); } elsif ($target eq 'modified') { my $text=$$parser[-1]->get_text("/label");