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.212 and 1.215

version 1.212, 2002/11/06 23:05:02	version 1.215, 2002/11/13 23:21:07
Line 404 sub registerurl {	Line 404 sub registerurl {
if ($ENV{'request.filename'}=~/\.(problem\|exam\|quiz\|assess\|survey\|form)$/) {	if ($ENV{'request.filename'}=~/\.(problem\|exam\|quiz\|assess\|survey\|form)$/) {
if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {	if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
$hwkadd.=(<<ENDSUBM);	$hwkadd.=(<<ENDSUBM);
menu.switchbutton(7,1,'subm.gif','view sub','missions','gocmd("/adm/grades","submission")');	menu.switchbutton(7,1,'subm.gif','view sub','missions','gocmd("/adm/grades","submission")',
	'View user submissions for this assessment resource');
ENDSUBM	ENDSUBM
}	}
if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) {	if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) {
$hwkadd.=(<<ENDGRDS);	$hwkadd.=(<<ENDGRDS);
menu.switchbutton(7,2,'pgrd.gif','problem','grades','gocmd("/adm/grades","gradingmenu")');	menu.switchbutton(7,2,'pgrd.gif','problem','grades','gocmd("/adm/grades","gradingmenu")',
	'Modify user grades for this assessment resource');
ENDGRDS	ENDGRDS
}	}
if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {	if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
$hwkadd.=(<<ENDPARM);	$hwkadd.=(<<ENDPARM);
menu.switchbutton(7,3,'pparm.gif','problem','parms','gocmd("/adm/parmset","set")');	menu.switchbutton(7,3,'pparm.gif','problem','parms','gocmd("/adm/parmset","set")',
	'Modify deadlines, etc, for this assessment resource');
ENDPARM	ENDPARM
}	}
}	}
Line 430 ENDPARM	Line 433 ENDPARM
$newmail	$newmail
menu.currentURL=window.location.pathname;	menu.currentURL=window.location.pathname;
menu.reloadURL=window.location.pathname;	menu.reloadURL=window.location.pathname;
	menu.currentSymb="$ENV{'request.symb'}";
	menu.reloadSymb="$ENV{'request.symb'}";
menu.currentStale=0;	menu.currentStale=0;
menu.clearbut(3,1);	menu.clearbut(3,1);
menu.switchbutton	menu.switchbutton
(6,3,'catalog.gif','catalog','info','catalog_info()');	(6,3,'catalog.gif','catalog','info','catalog_info()');
menu.switchbutton	menu.switchbutton
(8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)');	(8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)','Provide my evaluation of this resource');
menu.switchbutton	menu.switchbutton
(8,2,'fdbk.gif','feedback','discuss','gopost("/adm/feedback",currentURL)');	(8,2,'fdbk.gif','feedback','discuss','gopost("/adm/feedback",currentURL)','Provide feedback messages or contribute to the course discussion about this resource');
menu.switchbutton	menu.switchbutton
(8,3,'prt.gif','prepare','printout','gopost("/adm/printout",currentURL)');	(8,3,'prt.gif','prepare','printout','gopost("/adm/printout",currentURL)','Prepare a printable document');
menu.switchbutton	menu.switchbutton
(2,1,'back.gif','backward','','gopost("/adm/flip","back:"+currentURL)');	(2,1,'back.gif','backward','','gopost("/adm/flip","back:"+currentURL)','Go to the previous resource in the course sequence');
menu.switchbutton	menu.switchbutton
(2,3,'forw.gif','forward','','gopost("/adm/flip","forward:"+currentURL)');	(2,3,'forw.gif','forward','','gopost("/adm/flip","forward:"+currentURL)','Go to the next resource in the course sequence');
menu.switchbutton	menu.switchbutton
(9,1,'sbkm.gif','set','bookmark','set_bookmark()');	(9,1,'sbkm.gif','set','bookmark','set_bookmark()','Set a bookmark for this resource');
menu.switchbutton	menu.switchbutton
(9,2,'vbkm.gif','view','bookmark','edit_bookmarks()');	(9,2,'vbkm.gif','view','bookmark','edit_bookmarks()','Use or edit my bookmark collection');
menu.switchbutton	menu.switchbutton
(9,3,'anot.gif','anno-','tations','annotate()');	(9,3,'anot.gif','anno-','tations','annotate()','Make notes and annotations about this resource');
$hwkadd	$hwkadd
}	}

Line 458 ENDPARM	Line 463 ENDPARM
menu.currentStale=1;	menu.currentStale=1;
if (menu.reloadURL!='' && menu.reloadURL!= null) {	if (menu.reloadURL!='' && menu.reloadURL!= null) {
menu.switchbutton	menu.switchbutton
(3,1,'reload.gif','return','location','go(reloadURL)');	(3,1,'reload.gif','return','location','go(reloadURL)','Return to the last known location in the course sequence');
}	}
menu.clearbut(7,1);	menu.clearbut(7,1);
menu.clearbut(7,2);	menu.clearbut(7,2);
Line 858 sub init_safespace {	Line 863 sub init_safespace {
$safehole->wrap(\&Math::Cephes::y1,$safeeval,'&y1');	$safehole->wrap(\&Math::Cephes::y1,$safeeval,'&y1');
$safehole->wrap(\&Math::Cephes::yn,$safeeval,'&yn');	$safehole->wrap(\&Math::Cephes::yn,$safeeval,'&yn');
$safehole->wrap(\&Math::Cephes::yv,$safeeval,'&yv');	$safehole->wrap(\&Math::Cephes::yv,$safeeval,'&yv');

	$safehole->wrap(\&Math::Cephes::bdtr ,$safeeval,'&bdtr' );
	$safehole->wrap(\&Math::Cephes::bdtrc ,$safeeval,'&bdtrc' );
	$safehole->wrap(\&Math::Cephes::bdtri ,$safeeval,'&bdtri' );
	$safehole->wrap(\&Math::Cephes::btdtr ,$safeeval,'&btdtr' );
	$safehole->wrap(\&Math::Cephes::chdtr ,$safeeval,'&chdtr' );
	$safehole->wrap(\&Math::Cephes::chdtrc,$safeeval,'&chdtrc');
	$safehole->wrap(\&Math::Cephes::chdtri,$safeeval,'&chdtri');
	$safehole->wrap(\&Math::Cephes::fdtr ,$safeeval,'&fdtr' );
	$safehole->wrap(\&Math::Cephes::fdtrc ,$safeeval,'&fdtrc' );
	$safehole->wrap(\&Math::Cephes::fdtri ,$safeeval,'&fdtri' );
	$safehole->wrap(\&Math::Cephes::gdtr ,$safeeval,'&gdtr' );
	$safehole->wrap(\&Math::Cephes::gdtrc ,$safeeval,'&gdtrc' );
	$safehole->wrap(\&Math::Cephes::nbdtr ,$safeeval,'&nbdtr' );
	$safehole->wrap(\&Math::Cephes::nbdtrc,$safeeval,'&nbdtrc');
	$safehole->wrap(\&Math::Cephes::nbdtri,$safeeval,'&nbdtri');
	$safehole->wrap(\&Math::Cephes::ndtr ,$safeeval,'&ndtr' );
	$safehole->wrap(\&Math::Cephes::ndtri ,$safeeval,'&ndtri' );
	$safehole->wrap(\&Math::Cephes::pdtr ,$safeeval,'&pdtr' );
	$safehole->wrap(\&Math::Cephes::pdtrc ,$safeeval,'&pdtrc' );
	$safehole->wrap(\&Math::Cephes::pdtri ,$safeeval,'&pdtri' );
	$safehole->wrap(\&Math::Cephes::stdtr ,$safeeval,'&stdtr' );
	$safehole->wrap(\&Math::Cephes::stdtri,$safeeval,'&stdtri');

	# $safehole->wrap(\&Math::Cephes::new_fract,$safeeval,'&new_fract');
	# $safehole->wrap(\&Math::Cephes::radd,$safeeval,'&radd');
	# $safehole->wrap(\&Math::Cephes::rsub,$safeeval,'&rsub');
	# $safehole->wrap(\&Math::Cephes::rmul,$safeeval,'&rmul');
	# $safehole->wrap(\&Math::Cephes::rdiv,$safeeval,'&rdiv');
	# $safehole->wrap(\&Math::Cephes::euclid,$safeeval,'&euclid');

$safehole->wrap(\&Math::Random::random_beta,$safeeval,'&math_random_beta');	$safehole->wrap(\&Math::Random::random_beta,$safeeval,'&math_random_beta');
$safehole->wrap(\&Math::Random::random_chi_square,$safeeval,'&math_random_chi_square');	$safehole->wrap(\&Math::Random::random_chi_square,$safeeval,'&math_random_chi_square');
$safehole->wrap(\&Math::Random::random_exponential,$safeeval,'&math_random_exponential');	$safehole->wrap(\&Math::Random::random_exponential,$safeeval,'&math_random_exponential');
Line 1354 sub warning {	Line 1390 sub warning {
}	}

sub get_param {	sub get_param {
my ($param,$parstack,$safeeval,$context) = @_;	my ($param,$parstack,$safeeval,$context,$case_insensitive) = @_;
if ( ! $context ) { $context = -1; }	if ( ! $context ) { $context = -1; }
my $args ='';	my $args ='';
if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }	if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
if ( ! $args ) { return undef; }	if ( ! $args ) { return undef; }
if ( $args =~ /my \$$param=\"/ ) {	if ( $case_insensitive ) {
return &Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'	if ($args =~ s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei) {
} else {	return &Apache::run::run("{$args;".'return $'.$param.'}',
return undef;	$safeeval); #'
}	} else {
	return undef;
	}
	} else {
	if ( $args =~ /my \$\Q$param\E=\"/ ) {
	return &Apache::run::run("{$args;".'return $'.$param.'}',
	$safeeval); #'
	} else {
	return undef;
	}
	}
}	}

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

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

Removed from v.1.212
changed lines
	Added in v.1.215