--- loncom/xml/lonxml.pm 2002/01/09 09:50:59 1.148 +++ loncom/xml/lonxml.pm 2002/03/06 20:28:19 1.155 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.148 2002/01/09 09:50:59 albertel Exp $ +# $Id: lonxml.pm,v 1.155 2002/03/06 20:28:19 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -316,6 +316,8 @@ sub fontsettings() { sub registerurl { my $forcereg=shift; + my $target = shift; + my $result = ''; if ($ENV{'request.publicaccess'}) { return ''; @@ -347,7 +349,7 @@ ENDGRDS ENDPARM } } - return (< // BEGIN LON-CAPA Internal @@ -399,7 +401,7 @@ ENDPARM ENDREGTHIS } else { - return (< // BEGIN LON-CAPA Internal @@ -426,8 +428,30 @@ ENDREGTHIS // END LON-CAPA Internal ENDDONOTREGTHIS - } + if ($target eq 'edit') { + $result .=<<"ENDBROWSERSCRIPT"; + +ENDBROWSERSCRIPT + } + return $result; } sub loadevents() { @@ -463,7 +487,7 @@ sub xmlparse { ($target, my @tenta) = split('&&',$target); - my @stack = (); + my @stack = (); my @parstack = (); &initdepth; @@ -533,8 +557,14 @@ sub inner_xmlparse { } elsif ($token->[0] eq 'E') { #clear out any tags that didn't end while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) { - &Apache::lonxml::warning('Missing tag </'.$$stack['-1'].'> in file'); - &end_tag($stack,$parstack,$token); + my $lasttag=$$stack[-1]; + if ($token->[1] =~ /^$lasttag$/i) { + &Apache::lonxml::warning('Using tag </'.$token->[1].'> as end tag to <'.$$stack[-1].'>'); + last; + } else { + &Apache::lonxml::warning('Found tag </'.$token->[1].'> when looking for </'.$$stack[-1].'> in file'); + &end_tag($stack,$parstack,$token); + } } if (exists($$style_for_target{'/'."$token->[1]"})) { @@ -613,10 +643,16 @@ sub recurse { $safeeval, $style_for_target); } elsif ($tokenpat->[0] eq 'E') { #clear out any tags that didn't end - while ($tokenpat->[1] ne $innerstack[$#innerstack] + while ($tokenpat->[1] ne $innerstack[$#innerstack] && ($#innerstack > -1)) { - &Apache::lonxml::warning('Missing tag </'.$innerstack['-1'].'> in style'); - &end_tag(\@innerstack,\@innerparstack,$tokenpat); + my $lasttag=$innerstack[-1]; + if ($tokenpat->[1] =~ /^$lasttag$/i) { + &Apache::lonxml::warning('Using tag </'.$tokenpat->[1].'> as end tag to <'.$innerstack[-1].'>'); + last; + } else { + &Apache::lonxml::warning('Found tag </'.$tokenpat->[1].'> when looking for </'.$innerstack[-1].'> in file'); + &end_tag(\@innerstack,\@innerparstack,$tokenpat); + } } $partstring = &callsub("end_$tokenpat->[1]", $target, $tokenpat, \@innerstack, \@innerparstack, \@pat, @@ -677,13 +713,13 @@ sub callsub { } if (!$deleted) { if ($space) { - #&Apache::lonxml::debug("Calling sub $sub in $space $metamode
\n"); + #&Apache::lonxml::debug("Calling sub $sub in $space $metamode"); $sub1="$space\:\:$sub"; ($currentstring,$nodefault) = &$sub1($target,$token,$tagstack, $parstack,$parser,$safeeval, $style); } else { - #&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode
\n"); + #&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode"); if ($metamode <1) { if (defined($token->[4]) && ($metamode < 1)) { $currentstring = $token->[4]; @@ -885,10 +921,10 @@ sub get_all_text { } elsif ($token->[0] eq 'PI') { $result.=$token->[2]; } elsif ($token->[0] eq 'S') { - if ($token->[1] eq $tag) { $depth++; } + if ($token->[1] =~ /^$tag$/i) { $depth++; } $result.=$token->[4]; } elsif ($token->[0] eq 'E') { - if ( $token->[1] eq $tag) { $depth--; } + if ( $token->[1] =~ /^$tag$/i) { $depth--; } #skip sending back the last end tag if ($depth > -1) { $result.=$token->[2]; } else { $pars->unget_token($token); @@ -903,7 +939,7 @@ sub get_all_text { } elsif ($token->[0] eq 'PI') { $result.=$token->[2]; } elsif ($token->[0] eq 'S') { - if ( $token->[1] eq $tag) { + if ( $token->[1] =~ /^$tag$/i) { $pars->unget_token($token); last; } else { $result.=$token->[4]; @@ -936,7 +972,7 @@ sub parstring { foreach (@{$token->[3]}) { unless ($_=~/\W/) { my $val=$token->[2]->{$_}; - $val =~ s/([\%\@\\])/\\$1/g; + $val =~ s/([\%\@\\\"])/\\$1/g; #if ($val =~ m/^[\%\@]/) { $val="\\".$val; } $temp .= "my \$$_=\"$val\";" } @@ -966,16 +1002,8 @@ sub writeallows { # sub afterburn { my $result=shift; - foreach (split(/&/,$ENV{'QUERY_STRING'})) { - my ($name, $value) = split(/=/,$_); - $value =~ tr/+/ /; - $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - if (($name eq 'highlight')||($name eq 'anchor')||($name eq 'link')) { - unless ($ENV{'form.'.$name}) { - $ENV{'form.'.$name}=$value; - } - } - } + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['highlight','anchor','link']); if ($ENV{'form.highlight'}) { foreach (split(/\,/,$ENV{'form.highlight'})) { my $anchorname=$_; @@ -1016,10 +1044,8 @@ sub storefile { } } -sub inserteditinfo { - my ($result,$filecontents)=@_; - unless ($filecontents) { - $filecontents=(< @@ -1033,8 +1059,12 @@ sub inserteditinfo { </body> </html> SIMPLECONTENT - } + return $filecontents; +} + +sub inserteditinfo { + my ($result,$filecontents)=@_; $filecontents =~ s:</textarea>:</textarea>:ig; # my $editheader='<a href="#editsection">Edit below</a><hr />'; my $editfooter=(<<ENDFOOTER); @@ -1055,21 +1085,37 @@ ENDFOOTER return $result; } -sub editbutton { - my ($result) = @_; - my $button=(<<EDITBUTTON); -<form method="post"> -<input type="submit" name="showmode" value="Edit" /> -</form> -EDITBUTTON - $result=~s/(\<\/body\>)/$button/is; - return $result; +sub get_target { + my $viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}); + if ( $ENV{'request.state'} eq 'published') { + if ( defined($ENV{'form.grade_target'}) + && ($viewgrades == 'F' )) { + return ($ENV{'form.grade_target'}); + } elsif (defined($ENV{'form.grade_target'})) { + if (($ENV{'form.grade_target'} eq 'web') || + ($ENV{'form.grade_target'} eq 'tex') ) { + return $ENV{'form.grade_target'} + } else { + return 'web'; + } + } else { + return 'web'; + } + } elsif ($ENV{'request.state'} eq 'construct') { + if ( defined($ENV{'form.grade_target'})) { + return ($ENV{'form.grade_target'}); + } else { + return 'web'; + } + } else { + return 'web'; + } } sub handler { my $request=shift; - my $target='web'; + my $target=&get_target(); $Apache::lonxml::debug=0; @@ -1108,6 +1154,10 @@ sub handler { </html> ENDNOTFOUND $filecontents=''; + if ($ENV{'request.state'} ne 'published') { + $filecontents=&createnewhtml(); + $ENV{'form.showmode'}='Edit'; #force edit mode + } } else { unless ($ENV{'request.state'} eq 'published') { if ($ENV{'form.attemptclean'}) { @@ -1126,8 +1176,6 @@ ENDNOTFOUND if ($ENV{'form.showmode'} eq 'Edit') { $result='<html><body bgcolor="#FFFFFF"></body></html>'; $result=&inserteditinfo($result,$filecontents); - } else { - $result = &editbutton($result); } } <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> <html><head> <title>500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.