loncom/xml/lonxml.pm - diff

Return to lonxml.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonxml.pm between versions 1.220 and 1.221.2.1

version 1.220, 2002/12/09 22:40:18	version 1.221.2.1, 2003/01/09 22:45:50
Line 352 sub printtokenheader {	Line 352 sub printtokenheader {
if ($target eq 'web') {	if ($target eq 'web') {
my %idhash=&Apache::lonnet::idrget($tudom,($tuname));	my %idhash=&Apache::lonnet::idrget($tudom,($tuname));
return	return
'<img align="right" src="/cgi-bin/barcode.gif?encode='.$token.'" />'.	'<img align="right" src="/cgi-bin/barcode.png?encode='.$token.'" />'.
'Checked out for '.$plainname.	'Checked out for '.$plainname.
'<br />User: '.$tuname.' at '.$tudom.	'<br />User: '.$tuname.' at '.$tudom.
'<br />ID: '.$idhash{$tuname}.	'<br />ID: '.$idhash{$tuname}.
Line 1122 sub get_all_text {	Line 1122 sub get_all_text {
if ( $tag =~ m:^/: ) {	if ( $tag =~ m:^/: ) {
my $tag=substr($tag,1);	my $tag=substr($tag,1);
#&Apache::lonxml::debug("have:$tag:");	#&Apache::lonxml::debug("have:$tag:");
while (($depth >=0) && ($#$pars > -1)) {	my $top_empty=0;
	while (($depth >=0) && ($#$pars > -1) && (!$top_empty)) {
while (($depth >=0) && ($token = $$pars[-1]->get_token)) {	while (($depth >=0) && ($token = $$pars[-1]->get_token)) {
#&Apache::lonxml::debug("e token:$token->[0]:$depth:$token->[1]:".$#$pars.":".$#Apache::lonxml::pwd);	#&Apache::lonxml::debug("e token:$token->[0]:$depth:$token->[1]:".$#$pars.":".$#Apache::lonxml::pwd);
if (($token->[0] eq 'T')\|\|($token->[0] eq 'C')\|\|($token->[0] eq 'D')) {	if (($token->[0] eq 'T')\|\|($token->[0] eq 'C')\|\|($token->[0] eq 'D')) {
Line 1144 sub get_all_text {	Line 1145 sub get_all_text {
pop(@$pars);	pop(@$pars);
pop(@Apache::lonxml::pwd);	pop(@Apache::lonxml::pwd);
}	}
	if (($depth >=0) && ($#$pars == 0) ) { $top_empty=1; }
}	}
} else {	} else {
while ($#$pars > -1) {	while ($#$pars > -1) {

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

Removed from v.1.220
changed lines
	Added in v.1.221.2.1