--- loncom/xml/lonxml.pm 2001/05/04 17:33:35 1.70
+++ loncom/xml/lonxml.pm 2001/06/02 19:55:46 1.85
@@ -6,17 +6,69 @@
# 6/1/1 Gerd Kortemeyer
# 2/21,3/13 Guy
# 3/29,5/4 Gerd Kortemeyer
+# 5/10 Scott Harrison
+# 5/26 Gerd Kortemeyer
+# 5/27 H. K. Ng
+# 6/2 Gerd Kortemeyer
package Apache::lonxml;
use vars
-qw(@pwd @outputstack $redirection $import @extlinks $metamode);
+qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace);
use strict;
use HTML::TokeParser;
use Safe;
use Safe::Hole;
+use Math::Cephes qw(:trigs :hypers :bessels erf erfc);
use Opcode;
+
+sub register {
+ my $space;
+ my @taglist;
+ my $temptag;
+ ($space,@taglist) = @_;
+ foreach $temptag (@taglist) {
+ $Apache::lonxml::alltags{$temptag}=$space;
+ }
+}
+
use Apache::Constants qw(:common);
+use Apache::lontexconvert;
+use Apache::style;
+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;
+#path to the directory containing the file currently being processed
+@pwd=();
+
+#these two are used for capturing a subset of the output for later processing,
+#don't touch them directly use &startredirection and &endredirection
+@outputstack = ();
+$redirection = 0;
+
+#controls wheter the <import> tag actually does
+$import = 1;
+@extlinks=();
+
+# meta mode is a bit weird only some output is to be turned off
+#<output> tag turns metamode off (defined in londefdef.pm)
+$metamode = 0;
+
+# turns on and of run::evaluate actually derefencing var refs
+$evaluate = 1;
+
+# data structure for eidt mode, determines what tags can go into what other tags
+%insertlist=();
+
+#stores the list of active tag namespaces
+@namespace=();
sub xmlbegin {
my $output='';
@@ -49,11 +101,23 @@ sub fontsettings() {
sub registerurl {
return (<<ENDSCRIPT);
<script language="JavaScript">
+// BEGIN LON-CAPA Internal
function LONCAPAreg() {
if (window.location.pathname!="/res/adm/pages/menu.html") {
menu=window.open("","LONCAPAmenu");
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)');
}
}
@@ -61,8 +125,16 @@ sub registerurl {
if (window.location.pathname!="/res/adm/pages/menu.html") {
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);
+ menu.switchbutton
+ (3,1,'reload.gif','return','location','go(currentURL)');
}
}
+// END LON-CAPA Internal
</script>
ENDSCRIPT
}
@@ -75,51 +147,35 @@ sub unloadevents() {
return 'LONCAPAstale();';
}
-sub register {
- my $space;
- my @taglist;
- my $temptag;
- ($space,@taglist) = @_;
- foreach $temptag (@taglist) {
- $Apache::lonxml::alltags{$temptag}=$space;
- }
-}
-
sub printalltags {
my $temp;
foreach $temp (sort keys %Apache::lonxml::alltags) {
&Apache::lonxml::debug("$temp -- $Apache::lonxml::alltags{$temp}");
}
}
-use Apache::style;
-use Apache::run;
-use Apache::londefdef;
-use Apache::scripttag;
-use Apache::edit;
-#================================================== Main subroutine: xmlparse
-@pwd=();
-@outputstack = ();
-$redirection = 0;
-$import = 1;
-@extlinks=();
-$metamode = 0;
sub xmlparse {
my ($target,$content_file_string,$safeinit,%style_for_target) = @_;
if ($target eq 'meta') {
- # meta mode is a bit weird only some output is to be turned off
- #<output> tag turns metamode off (defined in londefdef.pm)
$Apache::lonxml::redirection = 0;
$Apache::lonxml::metamode = 1;
+ $Apache::lonxml::evaluate = 1;
$Apache::lonxml::import = 0;
} elsif ($target eq 'grade') {
&startredirection;
$Apache::lonxml::metamode = 0;
+ $Apache::lonxml::evaluate = 1;
$Apache::lonxml::import = 1;
- } else {
+ } elsif ($target eq 'modified') {
+ $Apache::lonxml::redirection = 0;
$Apache::lonxml::metamode = 0;
+ $Apache::lonxml::evaluate = 0;
+ $Apache::lonxml::import = 0;
+ } else {
$Apache::lonxml::redirection = 0;
+ $Apache::lonxml::metamode = 0;
+ $Apache::lonxml::evaluate = 1;
$Apache::lonxml::import = 1;
}
#&printalltags();
@@ -135,15 +191,7 @@ sub xmlparse {
my $safeeval = new Safe;
my $safehole = new Safe::Hole;
- $safeeval->permit("entereval");
- $safeeval->permit(":base_math");
- $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);
@@ -174,8 +222,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
@@ -196,8 +244,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]:");
@@ -258,9 +306,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]
@@ -268,9 +316,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]:");
}
@@ -303,13 +351,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];
@@ -320,30 +370,80 @@ sub callsub {
$space=$Apache::lonxml::alltags{$tag}
}
if ($space) {
- &Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");
+ #&Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");
$sub1="$space\:\:$sub";
$Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
- $currentstring .= &$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");
+ #&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");
if ($metamode <1) {
if (defined($token->[4]) && ($metamode < 1)) {
- $currentstring .= $token->[4];
+ $currentstring = $token->[4];
} else {
- $currentstring .= $token->[2];
+ $currentstring = $token->[2];
}
}
}
- if ($target eq 'edit' && $token->[0] eq 'E') {
- $currentstring .= &Apache::edit::tag_end($target,$token,$parstack,$parser,
- $safeeval,$style);
+# &Apache::lonxml::debug("nodefalt:$nodefault:");
+ if ($currentstring eq '' && $nodefault eq '') {
+ if ($target eq 'edit') {
+ &Apache::lonxml::debug("doing default edit for $token->[1]");
+ if ($token->[0] eq 'S') {
+ $currentstring = &Apache::edit::tag_start($target,$token);
+ } elsif ($token->[0] eq 'E') {
+ $currentstring = &Apache::edit::tag_end($target,$token);
+ }
+ } elsif ($target eq 'modified') {
+ if ($token->[0] eq 'S') {
+ $currentstring = $token->[4];
+ $currentstring.=&Apache::edit::handle_insert();
+ } else {
+ $currentstring = $token->[2];
+ }
+ }
}
use strict 'refs';
}
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');
+
+#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, '');
@@ -351,7 +451,7 @@ sub startredirection {
sub endredirection {
if (!$Apache::lonxml::redirection) {
- &Apache::lonxml::error("Endredirection was called, before a startredirection, perhaps you have unbalanced tags. Some debuggin information:".join ":",caller);
+ &Apache::lonxml::error("Endredirection was called, before a startredirection, perhaps you have unbalanced tags. Some debuging information:".join ":",caller);
return '';
}
$Apache::lonxml::redirection--;
@@ -481,7 +581,6 @@ sub writeallows {
#
# Afterburner handles anchors, highlights and links
#
-
sub afterburn {
my $result=shift;
map {
@@ -524,6 +623,47 @@ 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) {
+ $filecontents=(<<SIMPLECONTENT);
+<html>
+<head>
+<title>
+ Title of Document Goes Here
+</title>
+</head>
+<body bgcolor="#FFFFFF">
+
+ Body of Document Goes Here
+
+</body>
+</html>
+SIMPLECONTENT
+ }
+ my $editheader='<a href="#editsection">Edit below</a><hr />';
+ my $editfooter=(<<ENDFOOTER);
+<hr />
+<a name="editsection" />
+<form method="post">
+<textarea cols="80" rows="40" name="filecont">$filecontents</textarea>
+<br />
+<input type="submit" name="savethisfile" value="Save this file" />
+</form>
+ENDFOOTER
+ $result=~s/(\<body[^\>]*\>)/$1$editheader/is;
+ $result=~s/(\<\/body\>)/$editfooter/is;
+ return $result;
+}
+
sub handler {
my $request=shift;
@@ -537,30 +677,46 @@ sub handler {
$request->content_type('text/html');
}
-# $request->print(<<ENDHEADER);
-#<html>
-#<head>
-#<title>Just test</title>
-#</head>
-#<body bgcolor="#FFFFFF">
-#ENDHEADER
-# &Apache::lonhomework::send_header($request);
$request->send_http_header;
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 %mystyle;
my $result = '';
my $filecontents=&Apache::lonnet::getfile($file);
if ($filecontents == -1) {
- &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");
+ $result=(<<ENDNOTFOUND);
+<html>
+<head>
+<title>File not found</title>
+</head>
+<body bgcolor="#FFFFFF">
+<b>File not found: $file</b>
+</body>
+</html>
+ENDNOTFOUND
$filecontents='';
} else {
$result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle);
}
+#
+# Edit action? Insert editing commands
+#
+ unless ($ENV{'request.state'} eq 'published') {
+ $result=&inserteditinfo($result,$filecontents);
+ }
+
$request->print($result);
writeallows($request->uri);
@@ -574,7 +730,7 @@ sub debug {
}
sub error {
- if ($Apache::lonxml::debug eq 1) {
+ if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) {
print "<b>ERROR:</b>".$_[0]."<br />\n";
} else {
print "<b>An Error occured while processing this resource. The instructor has been notified.</b> <br />";
@@ -588,19 +744,59 @@ sub error {
&Apache::lonmsg::user_normal_msg($user,$domain,"Error in $ENV{'request.filename'}",$_[0]);
}
}
-
+
#FIXME probably shouldn't have me get everything forever.
&Apache::lonmsg::user_normal_msg('albertel','msu',"Error in $ENV{'request.filename'}",$_[0]);
- #&Apache::lonmsg::user_normal_msg('albertel','103',"Error in $ENV{'request.filename'}",$_[0]);
+ #&Apache::lonmsg::user_normal_msg('albertel','103',"Error in $ENV{'request.filename'}",$_[0]);
}
}
sub warning {
- if ($Apache::lonxml::debug eq 1) {
+ if ($ENV{'request.state'} eq 'construct') {
print "<b>W</b>ARNING<b>:</b>".$_[0]."<br />\n";
}
}
+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;
+ my $tagnum=0;
+ my @order;
+ for ($i=0;$i < $#data; $i++) {
+ my $line = $data[$i];
+ if ( $line =~ /^\#/ || $line =~ /^\s*\n/) { next; }
+ if ( $line =~ /TABLE/ ) { last; }
+ my ($tag,$descrip,$function,$show) = split(/,/, $line);
+ $insertlist{"$tagnum.tag"} = $tag;
+ $insertlist{"$tagnum.description"} = $descrip;
+ $insertlist{"$tagnum.function"} = $function;
+ $insertlist{"$tagnum.show"}= $show;
+ $tagnum++;
+ }
+ $i++; #skipping TABLE line
+ $tagnum = 0;
+ for (;$i < $#data;$i++) {
+ my $line = $data[$i];
+ my ($mnemonic,@which) = split(/ +/,$line);
+ my $tag = $insertlist{"$tagnum.tag"};
+ for (my $j=0;$j <$#which;$j++) {
+ if ( $which[$j] eq 'Y' ) {
+ if ($insertlist{"$j.show"} ne 'no') {
+ push(@{ $insertlist{"$tag.which"} },$j);
+ }
+ }
+ }
+ $tagnum++;
+ }
+}
1;
__END__