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.131 and 1.135

version 1.131, 2001/09/28 18:20:06	version 1.135, 2001/10/05 16:55:12
Line 219 sub maketoken {	Line 219 sub maketoken {
}	}

sub printtokenheader {	sub printtokenheader {
my ($target,$token,$symb,$tuname,$tudom,$tcrsid)=@_;	my ($target,$token,$tsymb,$tcrsid,$tudom,$tuname)=@_;
unless ($token) { return ''; }	unless ($token) { return ''; }

unless ($symb) {	my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
$symb=&Apache::lonnet::symbread();	unless ($tsymb) {
	$tsymb=$symb;
}	}
unless ($tuname) {	unless ($tuname) {
$tuname=$ENV{'user.name'};	$tuname=$name;
$tudom=$ENV{'user.domain'};	$tudom=$domain;
$tcrsid=$ENV{'request.course.id'};	$tcrsid=$courseid;
}	}

my %reply=&Apache::lonnet::get('environment',	my %reply=&Apache::lonnet::get('environment',
Line 1105 sub get_param {	Line 1106 sub get_param {
}	}
}	}

	sub get_param_var {
	my ($param,$parstack,$safeeval,$context) = @_;
	if ( ! $context ) { $context = -1; }
	my $args ='';
	if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
	if ( $args !~ /my \$$param=\"/ ) { return undef; }
	my $value=&Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
	if ($value =~ /^[\$\@\%]/) {
	return &Apache::run::run("return $value",$safeeval,1);
	} else {
	return $value;
	}
	}

sub register_insert {	sub register_insert {
my @data = split /\n/, &Apache::lonnet::getfile('/home/httpd/lonTabs/insertlist.tab');	my @data = split /\n/, &Apache::lonnet::getfile('/home/httpd/lonTabs/insertlist.tab');
my $i;	my $i;
Line 1115 sub register_insert {	Line 1130 sub register_insert {
if ( $line =~ /^\#/ \|\| $line =~ /^\s*\n/) { next; }	if ( $line =~ /^\#/ \|\| $line =~ /^\s*\n/) { next; }
if ( $line =~ /TABLE/ ) { last; }	if ( $line =~ /TABLE/ ) { last; }
my ($tag,$descrip,$color,$function,$show) = split(/,/, $line);	my ($tag,$descrip,$color,$function,$show) = split(/,/, $line);
$insertlist{"$tagnum.tag"} = $tag;	if ($tag) {
$insertlist{"$tagnum.description"} = $descrip;	$insertlist{"$tagnum.tag"} = $tag;
$insertlist{"$tagnum.color"} = $color;	$insertlist{"$tagnum.description"} = $descrip;
$insertlist{"$tagnum.function"} = $function;	$insertlist{"$tagnum.color"} = $color;
$insertlist{"$tagnum.show"}= $show;	$insertlist{"$tagnum.function"} = $function;
$insertlist{"$tag.num"}=$tagnum;	if (!defined($show)) { $show='yes'; }
$tagnum++;	$insertlist{"$tagnum.show"}= $show;
	$insertlist{"$tag.num"}=$tagnum;
	$tagnum++;
	}
}	}
$i++; #skipping TABLE line	$i++; #skipping TABLE line
$tagnum = 0;	$tagnum = 0;
Line 1150 sub description {	Line 1168 sub description {
# calls to lonnet functions for this setup.	# calls to lonnet functions for this setup.
# - looks for form.grade_ parameters	# - looks for form.grade_ parameters
sub whichuser {	sub whichuser {
my $symb=&Apache::lonnet::symbread();	my ($symb,$courseid,$domain,$name);
my $courseid=$ENV{'request.course.id'};
my $domain=$ENV{'user.domain'};
my $name=$ENV{'user.name'};
if (defined($ENV{'form.grade_symb'})) {	if (defined($ENV{'form.grade_symb'})) {
my $tmp_courseid=$ENV{'form.grade_courseid'};	my $tmp_courseid=$ENV{'form.grade_courseid'};
my $allowed=&Apache::lonnet::allowed('mgr',$tmp_courseid);	my $allowed=&Apache::lonnet::allowed('mgr',$tmp_courseid);
Line 1163 sub whichuser {	Line 1178 sub whichuser {
$domain=$ENV{'form.grade_domain'};	$domain=$ENV{'form.grade_domain'};
$name=$ENV{'form.grade_username'};	$name=$ENV{'form.grade_username'};
}	}
	} else {
	$symb=&Apache::lonnet::symbread();
	$courseid=$ENV{'request.course.id'};
	$domain=$ENV{'user.domain'};
	$name=$ENV{'user.name'};
}	}
return ($symb,$courseid,$domain,$name);	return ($symb,$courseid,$domain,$name);
}	}

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

Removed from v.1.131
changed lines
	Added in v.1.135