--- loncom/xml/lonxml.pm 2001/05/10 19:10:25 1.73 +++ loncom/xml/lonxml.pm 2001/05/26 15:31:33 1.78 @@ -7,10 +7,11 @@ # 2/21,3/13 Guy # 3/29,5/4 Gerd Kortemeyer # 5/10 Scott Harrison +# 5/26 Gerd Kortemeyer package Apache::lonxml; use vars -qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate); +qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace); use strict; use HTML::TokeParser; use Safe; @@ -57,6 +58,11 @@ $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=''; @@ -163,6 +169,7 @@ sub xmlparse { 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 @@ -365,14 +372,16 @@ sub callsub { &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($token,$target); + $currentstring = &Apache::edit::tag_start($target,$token); } elsif ($token->[0] eq 'E') { - $currentstring = &Apache::edit::tag_end($token,$target); + $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]; } @@ -562,6 +571,39 @@ ENDSCRIPT return $result; } +sub inserteditinfo { + my ($result,$filecontents)=@_; + unless ($filecontents) { + $filecontents=(< + + + Title of Document Goes Here + + + + + Body of Document Goes Here + + + +SIMPLECONTENT + } + my $editheader='Edit below
'; + my $editfooter=(< + +
+ +
+ +
+ENDFOOTER + $result=~s/(\]*\>)/$1$editheader/is; + $result=~s/(\<\/body\>)/$editfooter/is; + return $result; +} + sub handler { my $request=shift; @@ -575,30 +617,46 @@ sub handler { $request->content_type('text/html'); } -# $request->print(< -# -#Just test -# -# -#ENDHEADER -# &Apache::lonhomework::send_header($request); $request->send_http_header; return OK if $request->header_only; +# +# Edit action? Save file. +# + unless ($ENV{'request.state'} eq 'published') { + if ($ENV{'form.savethisfile'}) { + + } + } my $file=&Apache::lonnet::filelocation("",$request->uri); my %mystyle; my $result = ''; my $filecontents=&Apache::lonnet::getfile($file); if ($filecontents == -1) { - &Apache::lonxml::error(" Unable to find $file"); + $result=(< + +File not found + + +File not found: $file + + +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); @@ -612,7 +670,7 @@ sub debug { } sub error { - if ($Apache::lonxml::debug eq 1) { + if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) { print "ERROR:".$_[0]."
\n"; } else { print "An Error occured while processing this resource. The instructor has been notified.
"; @@ -626,10 +684,10 @@ 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]); } } @@ -639,6 +697,38 @@ sub warning { } } +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__