loncom/homework/randomlabel.pm - diff

Return to randomlabel.pm CVS log

Up to [LON-CAPA] / loncom / homework

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

version 1.38, 2002/10/22 21:25:34	version 1.39, 2002/11/07 19:48:51
Line 82 sub check_int {	Line 82 sub check_int {
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::startredirection();
push (@Apache::lonxml::extlinks, '/res/adm/includes/GLabel.class');	push (@Apache::lonxml::extlinks, '/res/adm/includes/GLabel.class');
push (@Apache::lonxml::namespace,'randomlabel');	push (@Apache::lonxml::namespace,'randomlabel');
my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);	my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
Line 93 sub start_randomlabel {	Line 94 sub start_randomlabel {
} 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);
Line 105 sub start_randomlabel {	Line 106 sub start_randomlabel {
$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\">\n";	$result.='<img src="/cgi-bin/randomlabel.png?';
$result.="<param name=\"bgimg\" value=\"$bgimg\">\n";	$result.="BGIMG=".&Apache::lonnet::escape('/home/httpd/html/'.$bgimg);
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $newbgimg = $bgimg;	my $newbgimg = $bgimg;
$bgimg=~s/(.gif\|.jpg)$/.eps/;	$bgimg=~s/(.gif\|.jpg)$/.eps/;
Line 171 sub end_randomlabel {	Line 172 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;
	$result=&Apache::lonxml::endredirection();
	$result=~s/\s*&/&/g;
	$result=~s/\s*$//;
pop @Apache::lonxml::namespace;	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\">\n"; }	if( $count != 0) { $result.= "&COUNT=$count"; }
$count = $Apache::randomlabel::ilabel_cnt;	$count = $Apache::randomlabel::ilabel_cnt;
if( $count != 0) { $result.= "<param name=\"ICOUNT\" value=\"$count\">\n"; }	if( $count != 0) { $result.= "&ICOUNT=$count"; }
$result .= "</applet>\n<BR />";	$result.='" /><br />'."\n";
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$result='\end{picture}\\\\';	$result='\end{picture}\\\\';
@$parstack[-1]=~/\$height\s=\s?"(.+)?"/;	@$parstack[-1]=~/\$height\s=\s?"(.+)?"/;
Line 279 sub end_labelgroup {	Line 283 sub end_labelgroup {
&Apache::lonxml::error('Unknown type of label :'.$type.':');	&Apache::lonxml::error('Unknown type of label :'.$type.':');
}	}
if ($target eq 'web') {	if ($target eq 'web') {
$result .= '<param name="' . $str . '" value="'.$label.'">';	$result .= '&'. $str .'='.$label;
$result .= '<param name="' . $xstr . '" value="'.$x.'">';	$result .= '&'. $xstr .'='.$x;
$result .= '<param name="' . $ystr . '" value="'.$y.'">'."\n";	$result .= '&'. $ystr .'='.$y;
}	}
}	}
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {

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

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