--- loncom/xml/lonxml.pm 2001/05/13 20:01:11 1.74
+++ 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 %insertlist);
+qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace);
use strict;
use HTML::TokeParser;
use Safe;
@@ -60,6 +61,9 @@ $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='';
if ($ENV{'browser.mathml'}) {
@@ -165,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
@@ -376,6 +381,7 @@ sub callsub {
} elsif ($target eq 'modified') {
if ($token->[0] eq 'S') {
$currentstring = $token->[4];
+ $currentstring.=&Apache::edit::handle_insert();
} else {
$currentstring = $token->[2];
}
@@ -565,6 +571,39 @@ ENDSCRIPT
return $result;
}
+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;
@@ -578,30 +617,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;
+#
+# 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("<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);
@@ -643,27 +698,35 @@ sub warning {
}
sub register_insert {
- my @data = split /\n/, &Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/insertlist.tab');
+ 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);
- if ($show eq 'no') { next; }
- $insertlist{"$tag.description"} = $descrip;
- $insertlist{"$tag.function"} = $function;
- push (@order,$tag);
+ $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 ($tag,@which) = split(/ +/,$line);
+ my ($mnemonic,@which) = split(/ +/,$line);
+ my $tag = $insertlist{"$tagnum.tag"};
for (my $j=0;$j <$#which;$j++) {
if ( $which[$j] eq 'Y' ) {
- push(@{ $insertlist{"$tag.which"} },$order[$j]);
+ if ($insertlist{"$j.show"} ne 'no') {
+ push(@{ $insertlist{"$tag.which"} },$j);
+ }
}
}
+ $tagnum++;
}
}
1;