--- loncom/xml/lonxml.pm 2002/01/02 13:18:26 1.144 +++ loncom/xml/lonxml.pm 2002/02/21 04:11:25 1.152 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.144 2002/01/02 13:18:26 matthew Exp $ +# $Id: lonxml.pm,v 1.152 2002/02/21 04:11:25 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -54,6 +54,8 @@ # Dec Guy Albertelli # YEAR=2002 # 1/1 Gerd Kortemeyer +# 1/2 Matthew Hall +# 1/3 Gerd Kortemeyer # package Apache::lonxml; @@ -288,11 +290,14 @@ sub printtokenheader { $reply{'generation'}; if ($target eq 'web') { + my %idhash=&Apache::lonnet::idrget($tudom,($tuname)); return ''. 'Checked out for '.$plainname. '
User: '.$tuname.' at '.$tudom. + '
ID: '.$idhash{$tuname}. '
CourseID: '.$tcrsid. + '
Course: '.$ENV{'course.'.$tcrsid.'.description'}. '
DocID: '.$token. '
Time: '.localtime().'
'; } else { @@ -458,7 +463,7 @@ sub xmlparse { ($target, my @tenta) = split('&&',$target); - my @stack = (); + my @stack = (); my @parstack = (); &initdepth; @@ -528,8 +533,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]"})) { @@ -608,10 +619,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, @@ -672,13 +689,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]; @@ -880,10 +897,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); @@ -898,7 +915,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]; @@ -931,7 +948,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\";" } @@ -1006,13 +1023,13 @@ sub storefile { if (my $fh=Apache::File->new('>'.$file)) { print $fh $contents; $fh->close(); + } else { + &warning("Unable to save file $file"); } } -sub inserteditinfo { - my ($result,$filecontents)=@_; - unless ($filecontents) { - $filecontents=(< @@ -1026,28 +1043,56 @@ sub inserteditinfo { </body> </html> SIMPLECONTENT - } - my $editheader='<a href="#editsection">Edit below</a><hr />'; + return $filecontents; +} + + +sub inserteditinfo { + my ($result,$filecontents)=@_; + $filecontents =~ s:</textarea>:</textarea>:ig; +# 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="hidden" name="showmode" value="Edit" /> <input type="submit" name="attemptclean" value="Save and then attempt to clean HTML" /> <input type="submit" name="savethisfile" value="Save this" /> +<input type="submit" name="showmode" value="View" /> </form> ENDFOOTER - $result=~s/(\<body[^\>]*\>)/$1$editheader/is; +# $result=~s/(\<body[^\>]*\>)/$1$editheader/is; $result=~s/(\<\/body\>)/$editfooter/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'}); + } 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; @@ -1072,7 +1117,7 @@ sub handler { } } my %mystyle; - my $result = ''; + my $result = ''; my $filecontents=&Apache::lonnet::getfile($file); if ($filecontents == -1) { $result=(<<ENDNOTFOUND); @@ -1086,42 +1131,52 @@ 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'}) { - $filecontents=&htmlclean($filecontents,1); - } + unless ($ENV{'request.state'} eq 'published') { + if ($ENV{'form.attemptclean'}) { + $filecontents=&htmlclean($filecontents,1); } - $result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle); + } + if ($ENV{'form.showmode'} ne 'Edit') { + $result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle); + } } # # Edit action? Insert editing commands # unless ($ENV{'request.state'} eq 'published') { + if ($ENV{'form.showmode'} eq 'Edit') { + $result='<html><body bgcolor="#FFFFFF"></body></html>'; $result=&inserteditinfo($result,$filecontents); + } } - + writeallows($request->uri); $request->print($result); return OK; } - + sub debug { if ($Apache::lonxml::debug eq 1) { - print("DEBUG:".$_[0]."<br />\n"); + $|=1; + print("DEBUG:".join('<br />',@_)."<br />\n"); } } sub error { if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) { - print "<b>ERROR:</b>".$_[0]."<br />\n"; + print "<b>ERROR:</b>".join('<br />',@_)."<br />\n"; } else { print "<b>An Error occured while processing this resource. The instructor has been notified.</b> <br />"; #notify author - &Apache::lonmsg::author_res_msg($ENV{'request.filename'},$_[0]); + &Apache::lonmsg::author_res_msg($ENV{'request.filename'},join('<br />',@_)); #notify course if ( $ENV{'request.course.id'} ) { my $users=$ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}; @@ -1129,19 +1184,19 @@ sub error { foreach my $user (split /\,/, $users) { ($user,my $domain) = split /:/, $user; &Apache::lonmsg::user_normal_msg($user,$domain, - "Error [$declutter]",$_[0]); + "Error [$declutter]",join('<br />',@_)); } } #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','msu',"Error in $ENV{'request.filename'}",join('<br />',@_)); #&Apache::lonmsg::user_normal_msg('albertel','103',"Error in $ENV{'request.filename'}",$_[0]); } } sub warning { if ($ENV{'request.state'} eq 'construct') { - print "<b>W</b>ARNING<b>:</b>".$_[0]."<br />\n"; + print "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n"; } }