--- loncom/homework/structuretags.pm 2001/05/04 21:21:45 1.36
+++ loncom/homework/structuretags.pm 2001/06/26 21:09:08 1.44
@@ -1,6 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
# 2/19 Guy
+# 6/26/2001 fixed extra web display at end of tags
package Apache::structuretags;
use strict;
@@ -8,10 +9,11 @@ use Apache::lonnet;
sub BEGIN {
&Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
+# &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate'))
}
sub start_web {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]);
if ($target eq 'web') {
return $bodytext;
@@ -20,10 +22,11 @@ sub start_web {
}
sub end_web {
+ return '';
}
sub start_tex {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);
if ($target eq 'tex') {
return $bodytext
@@ -32,23 +35,33 @@ sub start_tex {
}
sub end_tex {
+ return '';
}
sub start_problem {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
#intialize globals
$Apache::inputtags::part='0';
@Apache::inputtags::responselist = ();
-
+ $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
+ &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
+ if ($Apache::lonhomework::type eq '') {
+ $Apache::lonhomework::type='homework';
+ }
#adeed vars to the scripting enviroment
my $expression='$external::part='.$Apache::inputtags::part.';';
&Apache::run::run($expression,$safeeval);
my $status;
my $datemsg;
- my $result=&Apache::londefdef::start_html($target,$token,$parstack,$parser,$safeeval);
+ #should get back a or the neccesary stuff to start XML/MathML
+ my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval);
+ my $head_tag_start='
'.&Apache::lonxml::registerurl();
+ my $body_tag_start='';
if ($target eq 'web' || $target eq 'grade') {
($status,$datemsg) = &Apache::lonhomework::check_date('0');
push (@Apache::inputtags::status,$status);
@@ -58,14 +71,14 @@ sub start_problem {
if ( $status eq 'CLOSED' ) {
my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
if ( $target eq "web" ) {
- return $result."
Problem is not open to be viewed. The problem $datemsg
";
+ $result.= $head_tag_start.'';
+ return $result . $body_tag_start .
+ "
Problem is not open to be viewed. The problem $datemsg
";
}
- }
+ }
}
if ($target eq 'web') {
- my $args ='';
- if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
- my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
+ my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
if ($name eq '') {
$name=&Apache::lonnet::EXT('resource.title');
if ($name eq 'con_lost') { $name = ''; }
@@ -73,8 +86,8 @@ sub start_problem {
$Apache::lonhomework::name=$name;
if ($status eq 'CAN_ANSWER') {
# create a page header and exit
- $result.="$name\n
- \n
+ $result.="$head_tag_start$name\n
+ $body_tag_start\n
\n";
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
- $result.="\n";
- }
+ $result.="\n";
+ }
}
- }
+ }
if ($target eq 'meta') {
if ($Apache::inputtags::part eq '0') {
-
$result=&Apache::response::mandatory_part_meta;
}
}
@@ -138,26 +154,29 @@ sub end_problem {
}
sub start_block {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $code = @$parstack[$#$parstack];
- $code =~ s/\"//g;
- $code .=';return $condition;';
-# print "
$code
";
- my $result = &Apache::run::run($code,$safeeval);
- &Apache::lonxml::debug("block :$code: returned :$result:");
- if ( ! $result ) {
- my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);
- &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]");
+ if ($target eq 'web' || $target eq 'grade') {
+ my $code = @$parstack[$#$parstack];
+ $code =~ s/\"//g;
+ $code .=';return $condition;';
+ # print "
$code
";
+ my $result = &Apache::run::run($code,$safeeval);
+ &Apache::lonxml::debug("block :$code: returned :$result:");
+ if ( ! $result ) {
+ my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);
+ &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]");
+ }
}
return "";
}
sub end_block {
+ return '';
}
sub start_while {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $code = @$parstack[$#$parstack];
$code =~ s/\"//g;
@@ -174,7 +193,7 @@ sub start_while {
}
sub end_while {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $code = pop @Apache::structuretags::whileconds;
my $bodytext = pop @Apache::structuretags::whilebody;
my $result = &Apache::run::run($code,$safeeval);
@@ -191,7 +210,7 @@ sub end_while {
# ...
#
sub start_randomlist {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);
my $b_parser= HTML::TokeParser->new(\$body);
my $b_tok;
@@ -241,15 +260,13 @@ sub end_randomlist {
}
sub start_part {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
- my $args ='';
- if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
- my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
$Apache::inputtags::part=$id;
@Apache::inputtags::responselist = ();
if ($target eq 'meta') {
return &Apache::response::mandatory_part_meta;
- } else {
+ } elsif ($target eq 'web' || $target eq 'grade') {
my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
push (@Apache::inputtags::status,$status);
my $expression='$external::datestatus="'.$status.'";';
@@ -266,19 +283,22 @@ sub start_part {
}
sub end_part {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
&Apache::lonxml::debug("in end_part $target ");
my $status=$Apache::inputtags::status['-1'];
pop @Apache::inputtags::status;
if ( $target eq 'meta' ) { return ''; }
- if ( $target eq 'grade' && $status eq 'CAN_ANSWER') {
- return &Apache::inputtags::grade;
+ if ( $target eq 'grade' && $status eq 'CAN_ANSWER') {
+ return &Apache::inputtags::grade;
}
- return &Apache::inputtags::gradestatus($Apache::inputtags::part);
+ if ($target eq 'web') {
+ return &Apache::inputtags::gradestatus($Apache::inputtags::part);
+ }
+ return '';
}
sub start_preduedate {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web' || $target eq 'grade') {
if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {
@@ -293,7 +313,7 @@ sub end_preduedate {
}
sub start_postanswerdate {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web' || $target eq 'grade') {
if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
&Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]);
@@ -307,7 +327,7 @@ sub end_postanswerdate {
}
sub start_notsolved {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web' || $target eq 'grade') {
my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
&Apache::lonxml::debug("not solved has :$gradestatus:");
@@ -324,7 +344,7 @@ sub end_notsolved {
}
sub start_solved {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web' || $target eq 'grade') {
my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
if ($gradestatus !~ /^correct/) {
@@ -339,21 +359,27 @@ sub end_solved {
}
sub start_startouttext {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my @result=(''.'');
if ($target eq 'edit' || $target eq 'modified' ) { @result=('','no'); }
return (@result);
}
sub end_startouttext {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
my $text='';
if ($target eq 'edit') {
$text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]);
- $result=
- &Apache::edit::tag_start("outtext").
- &Apache::edit::editfield($token->[1],$text,"Text Block");
+ $result.=&Apache::edit::start_table($token)."Text Block |
+Delete:".
+ &Apache::edit::deletelist($target,$token)
+ ." |
+".
+ &Apache::edit::insertlist($target,$token).
+ " |
+
\n".
+ &Apache::edit::editfield($token->[1],$text,"",50,5);
}
if ($target eq 'modified') {
$text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
@@ -362,14 +388,14 @@ sub end_startouttext {
return $result;
}
sub start_endouttext {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
- if ($target eq "edit" ) { $result=&Apache::edit::tag_end("outtext"); }
+ if ($target eq "edit" ) { $result=" |
".&Apache::edit::end_table()."\n"; }
if ($target eq "modified") { $result=''; }
return $result;
}
sub end_endouttext {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my @result=('','');
if ($target eq "edit" || $target eq 'modified') { @result=('','no'); }
return (@result);