--- loncom/homework/structuretags.pm 2001/05/31 22:37:56 1.39
+++ loncom/homework/structuretags.pm 2001/06/12 22:42:55 1.43
@@ -12,7 +12,7 @@ sub BEGIN {
}
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;
@@ -24,7 +24,7 @@ sub end_web {
}
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
@@ -36,20 +36,29 @@ sub end_tex {
}
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);
@@ -59,9 +68,11 @@ 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 $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
@@ -72,8 +83,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;
@@ -140,7 +151,7 @@ sub end_problem {
}
sub start_block {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web' || $target eq 'grade') {
my $code = @$parstack[$#$parstack];
@@ -162,7 +173,7 @@ sub end_block {
}
sub start_while {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $code = @$parstack[$#$parstack];
$code =~ s/\"//g;
@@ -179,7 +190,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);
@@ -196,7 +207,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;
@@ -246,7 +257,7 @@ sub end_randomlist {
}
sub start_part {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
$Apache::inputtags::part=$id;
@Apache::inputtags::responselist = ();
@@ -269,7 +280,7 @@ 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;
@@ -284,7 +295,7 @@ sub end_part {
}
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' ) {
@@ -299,7 +310,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]);
@@ -313,7 +324,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:");
@@ -330,7 +341,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/) {
@@ -345,21 +356,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($target,$token).
- &Apache::edit::editfield($token->[1],$text,"Text Block",50,5);
+ $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']);
@@ -368,14 +385,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($target,$token); }
+ 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);