--- loncom/homework/structuretags.pm 2006/04/14 21:42:05 1.345
+++ loncom/homework/structuretags.pm 2006/04/20 03:35:06 1.351
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.345 2006/04/14 21:42:05 albertel Exp $
+# $Id: structuretags.pm,v 1.351 2006/04/20 03:35:06 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -79,7 +79,6 @@ sub page_start {
}
}
-
if ($target eq 'tex') {
return
&Apache::londefdef::start_html($target,$token,$tagstack,
@@ -162,7 +161,6 @@ sub page_start {
}
$form_tag_start.='>';
}
-
return ($page_start,$form_tag_start);
}
@@ -250,7 +248,7 @@ sub problem_edit_header {
sub problem_edit_footer {
return '
'.
- &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields).
+ &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()).
"\n\n".&Apache::loncommon::end_page();
}
@@ -596,11 +594,14 @@ sub start_problem {
my $status;
my $accessmsg;
- #should get back a or the neccesary stuff to start XML/MathML
my $name= &get_resource_name($parstack,$safeeval);
- my ($result,$form_tag_start)=
- &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
- $name);
+ my ($result,$form_tag_start);
+ if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex') {
+ ($result,$form_tag_start) =
+ &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
+ $name);
+ }
+
if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';}
if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }
@@ -862,10 +863,10 @@ sub end_problem {
if ($target ne 'tex' &&
$env{'form.answer_output_mode'} ne 'tex') {
$result.="";
- $result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);
+ $result.= &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields());
}
if ($target eq 'web') {
- $result.=&Apache::lonxml::xmlend().'';
+ $result.= &Apache::loncommon::end_page({'discussion' => 1});
} elsif ($target eq 'tex') {
my $endminipage = '';
if (not $env{'form.problem_split'}=~/yes/) {
@@ -873,7 +874,6 @@ sub end_problem {
}
if ($env{'form.print_discussions'} eq 'yes') {
$result.=&Apache::lonxml::xmlend($target,$parser);
- $result=~s/<\/html>//;
} else {
$result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
if (not $env{'request.symb'} =~ m/\.page_/) {
@@ -890,7 +890,7 @@ sub end_problem {
}
if ($target eq 'answer' && ($env{'request.state'} eq 'construct')
&& $env{'form.answer_output_mode'} ne 'tex') {
- $result.=&Apache::lonxml::xmlend().'