--- loncom/xml/lonxml.pm 2001/05/26 15:31:33 1.78
+++ loncom/xml/lonxml.pm 2001/06/12 21:10:22 1.91
@@ -8,6 +8,8 @@
# 3/29,5/4 Gerd Kortemeyer
# 5/10 Scott Harrison
# 5/26 Gerd Kortemeyer
+# 5/27 H. K. Ng
+# 6/2,6/3,6/8,6/9 Gerd Kortemeyer
package Apache::lonxml;
use vars
@@ -16,6 +18,8 @@ use strict;
use HTML::TokeParser;
use Safe;
use Safe::Hole;
+use Math::Cephes qw(:trigs :hypers :bessels erf erfc);
+use Math::Random qw(:all);
use Opcode;
sub register {
@@ -35,6 +39,9 @@ use Apache::run;
use Apache::londefdef;
use Apache::scripttag;
use Apache::edit;
+use Apache::lonnet;
+use Apache::File;
+
#================================================== Main subroutine: xmlparse
#debugging control, to turn on debugging modify the correct handler
$Apache::lonxml::debug=0;
@@ -93,26 +100,103 @@ sub fontsettings() {
}
sub registerurl {
- return (<<ENDSCRIPT);
+ if ($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) {
+ my $hwkadd='';
+ if ($ENV{'REQUEST_URI'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+ if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
+ $hwkadd.=(<<ENDSUBM);
+ menu.switchbutton
+ (7,1,'subm.gif','view sub','missions',
+ 'gocmd("/adm/grades","submission")');
+ENDSUBM
+ }
+ if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) {
+ $hwkadd.=(<<ENDGRDS);
+ menu.switchbutton
+ (7,2,'pgrd.gif','problem','grades',
+ 'gocmd("/adm/grades","viewgrades")');
+ENDGRDS
+ }
+ if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
+ $hwkadd.=(<<ENDPARM);
+ menu.switchbutton
+ (7,3,'pparm.gif','problem','parms',
+ 'gocmd("/adm/parmset","set")');
+ENDPARM
+ }
+ }
+ return (<<ENDREGTHIS);
+
<script language="JavaScript">
// BEGIN LON-CAPA Internal
+
function LONCAPAreg() {
- if (window.location.pathname!="/res/adm/pages/menu.html") {
menu=window.open("","LONCAPAmenu");
+ menu.clearTimeout(menu.menucltim);
menu.currentURL=window.location.pathname;
menu.currentStale=0;
- }
+ menu.clearbut(3,1);
+ menu.switchbutton
+ (8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)');
+ menu.switchbutton
+ (8,2,'fdbk.gif','feedback','on this','gopost("/adm/feedback",currentURL)');
+ menu.switchbutton
+ (8,3,'prt.gif','prepare','printout','gopost("/adm/printout",currentURL)');
+ menu.switchbutton
+ (2,1,'back.gif','backward','','gopost("/adm/flip","back:"+currentURL)');
+ menu.switchbutton
+ (2,3,'forw.gif','forward','','gopost("/adm/flip","forward:"+currentURL)');
+ $hwkadd
}
-
+
function LONCAPAstale() {
- if (window.location.pathname!="/res/adm/pages/menu.html") {
menu=window.open("","LONCAPAmenu");
menu.currentStale=1;
- }
+ menu.switchbutton
+ (3,1,'reload.gif','return','location','go(currentURL)');
+ menu.clearbut(7,1);
+ menu.clearbut(7,2);
+ menu.clearbut(7,3);
+ menu.menucltim=menu.setTimeout(
+ 'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);',
+ 2000);
+
+ }
+
+// END LON-CAPA Internal
+</script>
+ENDREGTHIS
+
+ } else {
+ return (<<ENDDONOTREGTHIS);
+
+<script language="JavaScript">
+// BEGIN LON-CAPA Internal
+
+ function LONCAPAreg() {
+ menu=window.open("","LONCAPAmenu");
+ menu.currentStale=1;
+ menu.clearbut(2,1);
+ menu.clearbut(2,3);
+ menu.clearbut(8,1);
+ menu.clearbut(8,2);
+ menu.clearbut(8,3);
+ if (menu.currentURL) {
+ menu.switchbutton
+ (3,1,'reload.gif','return','location','go(currentURL)');
+ } else {
+ menu.clearbut(3,1);
+ }
+ }
+
+ function LONCAPAstale() {
}
+
// END LON-CAPA Internal
</script>
-ENDSCRIPT
+ENDDONOTREGTHIS
+
+ }
}
sub loadevents() {
@@ -131,7 +215,7 @@ sub printalltags {
}
sub xmlparse {
-
+# $Apache::lonxml::debug=1;
my ($target,$content_file_string,$safeinit,%style_for_target) = @_;
if ($target eq 'meta') {
$Apache::lonxml::redirection = 0;
@@ -167,16 +251,7 @@ sub xmlparse {
my $safeeval = new Safe;
my $safehole = new Safe::Hole;
- $safeeval->permit("entereval");
- $safeeval->permit(":base_math");
- $safeeval->permit("sort");
- $safeeval->deny(":base_io");
- $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
-#need to inspect this class of ops
-# $safeeval->deny(":base_orig");
- $safeinit .= ';$external::target='.$target.';';
- $safeinit .= ';$external::randomseed='.&Apache::lonnet::rndseed().';';
- &Apache::run::run($safeinit,$safeeval);
+ &init_safespace($target,$safeeval,$safehole,$safeinit);
#-------------------- Redefinition of the target in the case of compound target
($target, my @tenta) = split('&&',$target);
@@ -207,8 +282,8 @@ sub xmlparse {
$safeeval,\%style_for_target,@parstack);
}
} else {
- $result = &callsub("start_$token->[1]", $target, $token,\@parstack,
- \@pars, $safeeval, \%style_for_target);
+ $result = &callsub("start_$token->[1]", $target, $token, \@stack,
+ \@parstack, \@pars, $safeeval, \%style_for_target);
}
} elsif ($token->[0] eq 'E') {
#clear out any tags that didn't end
@@ -229,8 +304,8 @@ sub xmlparse {
}
} else {
- $result = &callsub("end_$token->[1]", $target, $token, \@parstack,
- \@pars,$safeeval, \%style_for_target);
+ $result = &callsub("end_$token->[1]", $target, $token, \@stack,
+ \@parstack, \@pars,$safeeval, \%style_for_target);
}
} else {
&Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:");
@@ -291,9 +366,9 @@ sub recurse {
push (@innerstack,$tokenpat->[1]);
push (@innerparstack,&parstring($tokenpat));
&increasedepth($tokenpat);
- $partstring = &callsub("start_$tokenpat->[1]",
- $target, $tokenpat, \@innerparstack,
- \@pat, $safeeval, $style_for_target);
+ $partstring = &callsub("start_$tokenpat->[1]", $target, $tokenpat,
+ \@innerstack, \@innerparstack, \@pat,
+ $safeeval, $style_for_target);
} elsif ($tokenpat->[0] eq 'E') {
#clear out any tags that didn't end
while ($tokenpat->[1] ne $innerstack[$#innerstack]
@@ -301,9 +376,9 @@ sub recurse {
&Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']");
pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat);
}
- $partstring = &callsub("end_$tokenpat->[1]",
- $target, $tokenpat, \@innerparstack,
- \@pat, $safeeval, $style_for_target);
+ $partstring = &callsub("end_$tokenpat->[1]", $target, $tokenpat,
+ \@innerstack, \@innerparstack, \@pat,
+ $safeeval, $style_for_target);
} else {
&Apache::lonxml::error("Unknown token event :$tokenpat->[0]:$tokenpat->[1]:");
}
@@ -336,14 +411,15 @@ sub recurse {
}
sub callsub {
- my ($sub,$target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my ($sub,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $currentstring='';
my $nodefault;
{
my $sub1;
no strict 'refs';
if ($target eq 'edit' && $token->[0] eq 'S') {
- $currentstring = &Apache::edit::tag_start($target,$token,$parstack,$parser,
+ $currentstring = &Apache::edit::tag_start($target,$token,$tagstack,
+ $parstack,$parser,
$safeeval,$style);
}
my $tag=$token->[1];
@@ -357,8 +433,9 @@ sub callsub {
#&Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");
$sub1="$space\:\:$sub";
$Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
- ($currentstring,$nodefault) = &$sub1($target,$token,$parstack,$parser,
- $safeeval,$style);
+ ($currentstring,$nodefault) = &$sub1($target,$token,$tagstack,
+ $parstack,$parser,$safeeval,
+ $style);
} else {
#&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");
if ($metamode <1) {
@@ -369,7 +446,7 @@ sub callsub {
}
}
}
- &Apache::lonxml::debug("nodefalt:$nodefault:");
+# &Apache::lonxml::debug("nodefalt:$nodefault:");
if ($currentstring eq '' && $nodefault eq '') {
if ($target eq 'edit') {
&Apache::lonxml::debug("doing default edit for $token->[1]");
@@ -392,6 +469,62 @@ sub callsub {
return $currentstring;
}
+sub init_safespace {
+ my ($target,$safeeval,$safehole,$safeinit) = @_;
+ $safeeval->permit("entereval");
+ $safeeval->permit(":base_math");
+ $safeeval->permit("sort");
+ $safeeval->deny(":base_io");
+ $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
+
+ $safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin');
+ $safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos');
+ $safehole->wrap(\&Math::Cephes::atan,$safeeval,'&atan');
+ $safehole->wrap(\&Math::Cephes::sinh,$safeeval,'&sinh');
+ $safehole->wrap(\&Math::Cephes::cosh,$safeeval,'&cosh');
+ $safehole->wrap(\&Math::Cephes::tanh,$safeeval,'&tanh');
+ $safehole->wrap(\&Math::Cephes::asinh,$safeeval,'&asinh');
+ $safehole->wrap(\&Math::Cephes::acosh,$safeeval,'&acosh');
+ $safehole->wrap(\&Math::Cephes::atanh,$safeeval,'&atanh');
+ $safehole->wrap(\&Math::Cephes::erf,$safeeval,'&erf');
+ $safehole->wrap(\&Math::Cephes::erfc,$safeeval,'&erfc');
+ $safehole->wrap(\&Math::Cephes::j0,$safeeval,'&j0');
+ $safehole->wrap(\&Math::Cephes::j1,$safeeval,'&j1');
+ $safehole->wrap(\&Math::Cephes::jn,$safeeval,'&jn');
+ $safehole->wrap(\&Math::Cephes::jv,$safeeval,'&jv');
+ $safehole->wrap(\&Math::Cephes::y0,$safeeval,'&y0');
+ $safehole->wrap(\&Math::Cephes::y1,$safeeval,'&y1');
+ $safehole->wrap(\&Math::Cephes::yn,$safeeval,'&yn');
+ $safehole->wrap(\&Math::Cephes::yv,$safeeval,'&yv');
+ $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_exponential,$safeeval,'&math_random_exponential');
+ $safehole->wrap(\&Math::Random::random_f,$safeeval,'&math_random_f');
+ $safehole->wrap(\&Math::Random::random_gamma,$safeeval,'&math_random_gamma');
+ $safehole->wrap(\&Math::Random::random_multivariate_normal,$safeeval,'&math_random_multivariate_normal');
+ $safehole->wrap(\&Math::Random::random_multinomial,$safeeval,'&math_random_multinomial');
+ $safehole->wrap(\&Math::Random::random_noncentral_chi_square,$safeeval,'&math_random_noncentral_chi_square');
+ $safehole->wrap(\&Math::Random::random_noncentral_f,$safeeval,'&math_random_noncentral_f');
+ $safehole->wrap(\&Math::Random::random_normal,$safeeval,'&math_random_normal');
+ $safehole->wrap(\&Math::Random::random_permutation,$safeeval,'&math_random_permutation');
+# $safehole->wrap(\&Math::Random::random_permuted_index,$safeeval,'&math_random_permuted_index');
+ $safehole->wrap(\&Math::Random::random_uniform,$safeeval,'&math_random_uniform');
+ $safehole->wrap(\&Math::Random::random_poisson,$safeeval,'&math_random_poisson');
+ $safehole->wrap(\&Math::Random::random_uniform_integer,$safeeval,'&math_random_uniform_integer');
+ $safehole->wrap(\&Math::Random::random_negative_binomial,$safeeval,'&math_random_negative_binomial');
+ $safehole->wrap(\&Math::Random::random_binomial,$safeeval,'&math_random_binomial');
+ $safehole->wrap(\&Math::Random::random_seed_from_phrase,$safeeval,'&random_seed_from_phrase');
+ $safehole->wrap(\&Math::Random::random_set_seed_from_phrase,$safeeval,'&random_set_seed_from_phrase');
+ $safehole->wrap(\&Math::Random::random_get_seed,$safeeval,'&random_get_seed');
+ $safehole->wrap(\&Math::Random::random_set_seed,$safeeval,'&random_set_seed');
+
+#need to inspect this class of ops
+# $safeeval->deny(":base_orig");
+ $safeinit .= ';$external::target="'.$target.'";';
+ $safeinit .= ';$external::randomseed='.&Apache::lonnet::rndseed().';';
+ &Apache::run::run($safeinit,$safeeval);
+}
+
sub startredirection {
$Apache::lonxml::redirection++;
push (@Apache::lonxml::outputstack, '');
@@ -571,6 +704,14 @@ ENDSCRIPT
return $result;
}
+sub storefile {
+ my ($file,$contents)=@_;
+ if (my $fh=Apache::File->new('>'.$file)) {
+ print $fh $contents;
+ $fh->close();
+ }
+}
+
sub inserteditinfo {
my ($result,$filecontents)=@_;
unless ($filecontents) {
@@ -621,16 +762,16 @@ sub handler {
return OK if $request->header_only;
+
+ my $file=&Apache::lonnet::filelocation("",$request->uri);
#
# Edit action? Save file.
#
unless ($ENV{'request.state'} eq 'published') {
if ($ENV{'form.savethisfile'}) {
-
+ &storefile($file,$ENV{'form.filecont'});
}
}
-
- my $file=&Apache::lonnet::filelocation("",$request->uri);
my %mystyle;
my $result = '';
my $filecontents=&Apache::lonnet::getfile($file);
@@ -697,6 +838,14 @@ sub warning {
}
}
+sub get_param {
+ my ($param,$parstack,$safeeval,$context) = @_;
+ if ( ! $context ) { $context = -1; }
+ my $args ='';
+ if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
+ return &Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
+}
+
sub register_insert {
my @data = split /\n/, &Apache::lonnet::getfile('/home/httpd/lonTabs/insertlist.tab');
my $i;