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.51 and 1.53

version 1.51, 2003/10/16 19:23:58	version 1.53, 2003/11/11 00:25:24
Line 63 use Apache::edit;	Line 63 use Apache::edit;
use Apache::File();	use Apache::File();
use Apache::Constants qw(:common :http);	use Apache::Constants qw(:common :http);

	my %args;
	my $cgi_id;

BEGIN {	BEGIN {
&Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));	&Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));
}	}
Line 97 sub start_randomlabel {	Line 100 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') {
&Apache::lonxml::startredirection();	$cgi_id=&Apache::loncommon::get_cgi_id();
$result.="BGIMG=".&Apache::lonnet::escape($bgimg);	%args=();
	$args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $newbgimg = $bgimg;	my $newbgimg = $bgimg;
$bgimg=~s/\.(gif\|jpg\|png\|jpeg)$/\.eps/i;	$bgimg=~s/\.(gif\|jpg\|png\|jpeg)$/\.eps/i;
Line 158 sub end_randomlabel {	Line 162 sub end_randomlabel {
my $count;	my $count;
pop @Apache::lonxml::namespace;	pop @Apache::lonxml::namespace;
if ($target eq 'web') {	if ($target eq 'web') {
my $args=&Apache::lonxml::endredirection();
$args=~s/\s*&/&/g;
$args=~s/\s*$//;
$count = $Apache::randomlabel::tlabel_cnt;	$count = $Apache::randomlabel::tlabel_cnt;
if( $count != 0) { $args.= "&COUNT=$count"; }	if( $count != 0) { $args{"cgi.$cgi_id.COUNT"}=$count; }
$count = $Apache::randomlabel::ilabel_cnt;	$count = $Apache::randomlabel::ilabel_cnt;
if( $count != 0) { $args.= "&ICOUNT=$count"; }	if( $count != 0) { $args{"cgi.$cgi_id.ICOUNT"}=$count; }
my $token=$Apache::lonxml::curdepth.'_'.$$;	$result.='<img src="/adm/randomlabel.png?token='.$cgi_id.'" /><br />'."\n";
$result.='<img src="/adm/randomlabel.png?token='.$token;	&Apache::lonnet::appenv(%args);
$result.='" /><br />'."\n";
&Apache::lonnet::appenv(("imagerequest.$token"=>&Apache::lonnet::escape($args)));
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$result='\end{picture}\\\\';	$result='\end{picture}\\\\';
my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);	my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
Line 279 sub end_labelgroup {	Line 278 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 .= '&'. $str .'='.&Apache::lonnet::escape($label);	$args{"cgi.$cgi_id.$str"} =&Apache::lonnet::escape($label);
$result .= '&'. $xstr .'='.$x;	$args{"cgi.$cgi_id.$xstr"}=$x;
$result .= '&'. $ystr .'='.$y;	$args{"cgi.$cgi_id.$ystr"}=$y;
}	}
}	}
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
Line 404 sub start_label {	Line 403 sub start_label {
$result.=&Apache::edit::editline('',$text,'',50).	$result.=&Apache::edit::editline('',$text,'',50).
&Apache::edit::end_table();	&Apache::edit::end_table();
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/label");
$result = '<label>';	$result = '<label>';
if ($type eq 'image') {	if ($type eq 'image') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
Line 416 sub start_label {	Line 414 sub start_label {
$result = $token->[4];	$result = $token->[4];
}	}
}	}
$result.=&Apache::edit::modifiedfield($token);	$result.=&Apache::edit::modifiedfield("/label",$parser);
}	}
return $result;	return $result;
}	}

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

Removed from v.1.51
changed lines
	Added in v.1.53