version 1.141, 2001/12/14 22:59:34
|
version 1.148, 2002/01/09 09:50:59
|
Line 51
|
Line 51
|
# 8/7,8/9,8/10,8/11,8/15,8/16,8/17,8/18,8/20,8/23,8/24 Gerd Kortemeyer |
# 8/7,8/9,8/10,8/11,8/15,8/16,8/17,8/18,8/20,8/23,8/24 Gerd Kortemeyer |
# Guy Albertelli |
# Guy Albertelli |
# 9/26 Gerd Kortemeyer |
# 9/26 Gerd Kortemeyer |
|
# Dec Guy Albertelli |
|
# YEAR=2002 |
|
# 1/1 Gerd Kortemeyer |
|
# 1/2 Matthew Hall |
|
# 1/3 Gerd Kortemeyer |
|
# |
|
|
package Apache::lonxml; |
package Apache::lonxml; |
use vars |
use vars |
Line 74 sub register {
|
Line 79 sub register {
|
|
|
sub deregister { |
sub deregister { |
my ($space,@taglist) = @_; |
my ($space,@taglist) = @_; |
&printalltags(); |
|
foreach my $temptag (@taglist) { |
foreach my $temptag (@taglist) { |
my $tempspace = $Apache::lonxml::alltags{$temptag}[-1]; |
my $tempspace = $Apache::lonxml::alltags{$temptag}[-1]; |
if ($tempspace eq $space) { |
if ($tempspace eq $space) { |
pop(@{ $Apache::lonxml::alltags{$temptag} }); |
pop(@{ $Apache::lonxml::alltags{$temptag} }); |
} |
} |
} |
} |
&printalltags(); |
#&printalltags(); |
} |
} |
|
|
use Apache::Constants qw(:common); |
use Apache::Constants qw(:common); |
Line 286 sub printtokenheader {
|
Line 290 sub printtokenheader {
|
$reply{'generation'}; |
$reply{'generation'}; |
|
|
if ($target eq 'web') { |
if ($target eq 'web') { |
|
my %idhash=&Apache::lonnet::idrget($tudom,($tuname)); |
return |
return |
'<img align="right" src="/cgi-bin/barcode.gif?encode='.$token.'" />'. |
'<img align="right" src="/cgi-bin/barcode.gif?encode='.$token.'" />'. |
'Checked out for '.$plainname. |
'Checked out for '.$plainname. |
'<br />User: '.$tuname.' at '.$tudom. |
'<br />User: '.$tuname.' at '.$tudom. |
|
'<br />ID: '.$idhash{$tuname}. |
'<br />CourseID: '.$tcrsid. |
'<br />CourseID: '.$tcrsid. |
|
'<br />Course: '.$ENV{'course.'.$tcrsid.'.description'}. |
'<br />DocID: '.$token. |
'<br />DocID: '.$token. |
'<br />Time: '.localtime().'<hr />'; |
'<br />Time: '.localtime().'<hr />'; |
} else { |
} else { |
Line 926 sub newparser {
|
Line 933 sub newparser {
|
sub parstring { |
sub parstring { |
my ($token) = @_; |
my ($token) = @_; |
my $temp=''; |
my $temp=''; |
map { |
foreach (@{$token->[3]}) { |
unless ($_=~/\W/) { |
unless ($_=~/\W/) { |
my $val=$token->[2]->{$_}; |
my $val=$token->[2]->{$_}; |
$val =~ s/([\%\@\\])/\\$1/g; |
$val =~ s/([\%\@\\])/\\$1/g; |
#if ($val =~ m/^[\%\@]/) { $val="\\".$val; } |
#if ($val =~ m/^[\%\@]/) { $val="\\".$val; } |
$temp .= "my \$$_=\"$val\";" |
$temp .= "my \$$_=\"$val\";" |
} |
} |
} @{$token->[3]}; |
} |
return $temp; |
return $temp; |
} |
} |
|
|
Line 946 sub writeallows {
|
Line 953 sub writeallows {
|
my $thisdir=$thisurl; |
my $thisdir=$thisurl; |
$thisdir=~s/\/[^\/]+$//; |
$thisdir=~s/\/[^\/]+$//; |
my %httpref=(); |
my %httpref=(); |
map { |
foreach (@extlinks) { |
$httpref{'httpref.'. |
$httpref{'httpref.'. |
&Apache::lonnet::hreflocation($thisdir,$_)}=$thisurl; |
&Apache::lonnet::hreflocation($thisdir,$_)}=$thisurl; |
} @extlinks; |
} |
@extlinks=(); |
@extlinks=(); |
&Apache::lonnet::appenv(%httpref); |
&Apache::lonnet::appenv(%httpref); |
} |
} |
Line 959 sub writeallows {
|
Line 966 sub writeallows {
|
# |
# |
sub afterburn { |
sub afterburn { |
my $result=shift; |
my $result=shift; |
map { |
foreach (split(/&/,$ENV{'QUERY_STRING'})) { |
my ($name, $value) = split(/=/,$_); |
my ($name, $value) = split(/=/,$_); |
$value =~ tr/+/ /; |
$value =~ tr/+/ /; |
$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; |
$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; |
Line 968 sub afterburn {
|
Line 975 sub afterburn {
|
$ENV{'form.'.$name}=$value; |
$ENV{'form.'.$name}=$value; |
} |
} |
} |
} |
} (split(/&/,$ENV{'QUERY_STRING'})); |
} |
if ($ENV{'form.highlight'}) { |
if ($ENV{'form.highlight'}) { |
map { |
foreach (split(/\,/,$ENV{'form.highlight'})) { |
my $anchorname=$_; |
my $anchorname=$_; |
my $matchthis=$anchorname; |
my $matchthis=$anchorname; |
$matchthis=~s/\_+/\\s\+/g; |
$matchthis=~s/\_+/\\s\+/g; |
$result=~s/($matchthis)/\<font color=\"red\"\>$1\<\/font\>/gs; |
$result=~s/($matchthis)/\<font color=\"red\"\>$1\<\/font\>/gs; |
} split(/\,/,$ENV{'form.highlight'}); |
} |
} |
} |
if ($ENV{'form.link'}) { |
if ($ENV{'form.link'}) { |
map { |
foreach (split(/\,/,$ENV{'form.link'})) { |
my ($anchorname,$linkurl)=split(/\>/,$_); |
my ($anchorname,$linkurl)=split(/\>/,$_); |
my $matchthis=$anchorname; |
my $matchthis=$anchorname; |
$matchthis=~s/\_+/\\s\+/g; |
$matchthis=~s/\_+/\\s\+/g; |
$result=~s/($matchthis)/\<a href=\"$linkurl\"\>$1\<\/a\>/gs; |
$result=~s/($matchthis)/\<a href=\"$linkurl\"\>$1\<\/a\>/gs; |
} split(/\,/,$ENV{'form.link'}); |
} |
} |
} |
if ($ENV{'form.anchor'}) { |
if ($ENV{'form.anchor'}) { |
my $anchorname=$ENV{'form.anchor'}; |
my $anchorname=$ENV{'form.anchor'}; |
Line 1004 sub storefile {
|
Line 1011 sub storefile {
|
if (my $fh=Apache::File->new('>'.$file)) { |
if (my $fh=Apache::File->new('>'.$file)) { |
print $fh $contents; |
print $fh $contents; |
$fh->close(); |
$fh->close(); |
|
} else { |
|
&warning("Unable to save file $file"); |
} |
} |
} |
} |
|
|
Line 1025 sub inserteditinfo {
|
Line 1034 sub inserteditinfo {
|
</html> |
</html> |
SIMPLECONTENT |
SIMPLECONTENT |
} |
} |
my $editheader='<a href="#editsection">Edit below</a><hr />'; |
|
|
$filecontents =~ s:</textarea>:</textarea>:ig; |
|
# my $editheader='<a href="#editsection">Edit below</a><hr />'; |
my $editfooter=(<<ENDFOOTER); |
my $editfooter=(<<ENDFOOTER); |
<hr /> |
<hr /> |
<a name="editsection" /> |
<a name="editsection" /> |
<form method="post"> |
<form method="post"> |
<textarea cols="80" rows="40" name="filecont">$filecontents</textarea> |
<textarea cols="80" rows="40" name="filecont">$filecontents</textarea> |
<br /> |
<br /> |
|
<input type="hidden" name="showmode" value="Edit" /> |
<input type="submit" name="attemptclean" |
<input type="submit" name="attemptclean" |
value="Save and then attempt to clean HTML" /> |
value="Save and then attempt to clean HTML" /> |
<input type="submit" name="savethisfile" value="Save this" /> |
<input type="submit" name="savethisfile" value="Save this" /> |
|
<input type="submit" name="showmode" value="View" /> |
</form> |
</form> |
ENDFOOTER |
ENDFOOTER |
$result=~s/(\<body[^\>]*\>)/$1$editheader/is; |
# $result=~s/(\<body[^\>]*\>)/$1$editheader/is; |
$result=~s/(\<\/body\>)/$editfooter/is; |
$result=~s/(\<\/body\>)/$editfooter/is; |
return $result; |
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 handler { |
sub handler { |
my $request=shift; |
my $request=shift; |
|
|
Line 1070 sub handler {
|
Line 1094 sub handler {
|
} |
} |
} |
} |
my %mystyle; |
my %mystyle; |
my $result = ''; |
my $result = ''; |
my $filecontents=&Apache::lonnet::getfile($file); |
my $filecontents=&Apache::lonnet::getfile($file); |
if ($filecontents == -1) { |
if ($filecontents == -1) { |
$result=(<<ENDNOTFOUND); |
$result=(<<ENDNOTFOUND); |
Line 1085 sub handler {
|
Line 1109 sub handler {
|
ENDNOTFOUND |
ENDNOTFOUND |
$filecontents=''; |
$filecontents=''; |
} else { |
} else { |
unless ($ENV{'request.state'} eq 'published') { |
unless ($ENV{'request.state'} eq 'published') { |
if ($ENV{'form.attemptclean'}) { |
if ($ENV{'form.attemptclean'}) { |
$filecontents=&htmlclean($filecontents,1); |
$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 |
# Edit action? Insert editing commands |
# |
# |
unless ($ENV{'request.state'} eq 'published') { |
unless ($ENV{'request.state'} eq 'published') { |
|
if ($ENV{'form.showmode'} eq 'Edit') { |
|
$result='<html><body bgcolor="#FFFFFF"></body></html>'; |
$result=&inserteditinfo($result,$filecontents); |
$result=&inserteditinfo($result,$filecontents); |
|
} else { |
|
$result = &editbutton($result); |
|
} |
} |
} |
|
|
writeallows($request->uri); |
writeallows($request->uri); |
|
|
$request->print($result); |
$request->print($result); |
|
|
return OK; |
return OK; |
} |
} |
|
|
sub debug { |
sub debug { |
if ($Apache::lonxml::debug eq 1) { |
if ($Apache::lonxml::debug eq 1) { |
print("DEBUG:".$_[0]."<br />\n"); |
$|=1; |
|
print("DEBUG:".join('<br />',@_)."<br />\n"); |
} |
} |
} |
} |
|
|
sub error { |
sub error { |
if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) { |
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 { |
} else { |
print "<b>An Error occured while processing this resource. The instructor has been notified.</b> <br />"; |
print "<b>An Error occured while processing this resource. The instructor has been notified.</b> <br />"; |
#notify author |
#notify author |
&Apache::lonmsg::author_res_msg($ENV{'request.filename'},$_[0]); |
&Apache::lonmsg::author_res_msg($ENV{'request.filename'},join('<br />',@_)); |
#notify course |
#notify course |
if ( $ENV{'request.course.id'} ) { |
if ( $ENV{'request.course.id'} ) { |
my $users=$ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}; |
my $users=$ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}; |
|
my $declutter=&Apache::lonnet::declutter($ENV{'request.filename'}); |
foreach my $user (split /\,/, $users) { |
foreach my $user (split /\,/, $users) { |
($user,my $domain) = split /:/, $user; |
($user,my $domain) = split /:/, $user; |
&Apache::lonmsg::user_normal_msg($user,$domain,"Error in $ENV{'request.filename'}",$_[0]); |
&Apache::lonmsg::user_normal_msg($user,$domain, |
|
"Error [$declutter]",join('<br />',@_)); |
} |
} |
} |
} |
|
|
#FIXME probably shouldn't have me get everything forever. |
#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]); |
#&Apache::lonmsg::user_normal_msg('albertel','103',"Error in $ENV{'request.filename'}",$_[0]); |
} |
} |
} |
} |
|
|
sub warning { |
sub warning { |
if ($ENV{'request.state'} eq 'construct') { |
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"; |
} |
} |
} |
} |
|
|
Line 1194 sub register_insert {
|
Line 1228 sub register_insert {
|
my $line = $data[$i]; |
my $line = $data[$i]; |
my ($mnemonic,@which) = split(/ +/,$line); |
my ($mnemonic,@which) = split(/ +/,$line); |
my $tag = $insertlist{"$tagnum.tag"}; |
my $tag = $insertlist{"$tagnum.tag"}; |
for (my $j=0;$j <$#which;$j++) { |
for (my $j=0;$j <=$#which;$j++) { |
if ( $which[$j] eq 'Y' ) { |
if ( $which[$j] eq 'Y' ) { |
if ($insertlist{"$j.show"} ne 'no') { |
if ($insertlist{"$j.show"} ne 'no') { |
push(@{ $insertlist{"$tag.which"} },$j); |
push(@{ $insertlist{"$tag.which"} },$j); |