--- loncom/homework/randomlabel.pm 2002/08/07 21:49:35 1.34 +++ loncom/homework/randomlabel.pm 2002/10/22 21:25:34 1.38 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # random labelling tool # -# $Id: randomlabel.pm,v 1.34 2002/08/07 21:49:35 sakharuk Exp $ +# $Id: randomlabel.pm,v 1.38 2002/10/22 21:25:34 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -60,6 +60,8 @@ package Apache::randomlabel; use Apache::lonnet; use strict; use Apache::edit; +use Apache::File(); +use Apache::Constants qw(:common :http); BEGIN { &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label')); @@ -106,13 +108,34 @@ sub start_randomlabel { $result.="\n"; $result.="\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/\/$//; + #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; @@ -156,7 +179,7 @@ sub end_randomlabel { if( $count != 0) { $result.= "\n"; } $result .= "\n
"; } elsif ($target eq 'tex') { - $result='\end{picture}\\\\}'; + $result='\end{picture}\\\\'; @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/; my $one=$1; @$parstack[-1]=~/\$width\s*=\s*?"(.+)?"/; @@ -164,7 +187,7 @@ sub end_randomlabel { @$parstack[-1]=~/\$texwidth\s*=\s*?"(.+)?"/; my $three=$1; my $howtoskipback = $three*$one/$two; - $result.=' \vskip -'.$howtoskipback.' mm '; + $result.=' \vskip -'.$howtoskipback.' mm }'; } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; } @@ -177,8 +200,8 @@ sub start_labelgroup { 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') { + 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 = (); @@ -226,7 +249,8 @@ sub end_labelgroup { my $gname = $Apache::randomlabel::groupname; my $type = $Apache::randomlabel::type; 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); &Apache::structuretags::shuffle(\@idx_arr); for(0 .. $#Apache::randomlabel::label_arr) { @@ -350,8 +374,8 @@ 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') { + 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]); $ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]); if ($type eq 'image') {