--- loncom/homework/randomlabel.pm 2007/06/20 17:33:33 1.89 +++ loncom/homework/randomlabel.pm 2008/11/18 19:14:28 1.92 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # random labelling tool # -# $Id: randomlabel.pm,v 1.89 2007/06/20 17:33:33 banghart Exp $ +# $Id: randomlabel.pm,v 1.92 2008/11/18 19:14:28 jms Exp $ # # Copyright Michigan State University Board of Trustees # @@ -53,6 +53,7 @@ # (32,65) : $GroupTwo[1] = "TEXT-1" # (21,54) : $GroupTwo[2] = "TEXT-2" # =========================================== + package Apache::randomlabel; use Apache::lonnet; use strict; @@ -61,7 +62,6 @@ use Apache::File(); use Apache::Constants qw(:common :http); use Image::Magick; use Apache::lonplot; -use lib '/home/httpd/lib/perl/'; use LONCAPA; @@ -179,7 +179,7 @@ sub end_randomlabel { $count = $Apache::randomlabel::obj_cnt; if( $count != 0) { $args{"cgi.$cgi_id.OBJCOUNT"}=$count; } $result.='
'."\n"; - &Apache::lonnet::appenv(%args); + &Apache::lonnet::appenv(\%args); } elsif ($target eq 'tex') { $result='\end{picture}\\\\'; $result.= ' \vskip -'.$height_param.' mm } \\\\ '; @@ -553,6 +553,14 @@ sub end_location { } # +sub insert_label { + my ($after) = @_; + my $depth = scalar(@Apache::lonxml::depthcounter); + $depth-- if ($after); + my $inset = "\t"x$depth; + return "\n$inset"; +} + sub start_label { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result='';