--- loncom/homework/structuretags.pm 2005/06/28 19:17:36 1.295
+++ loncom/homework/structuretags.pm 2005/11/01 21:52:47 1.307
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.295 2005/06/28 19:17:36 albertel Exp $
+# $Id: structuretags.pm,v 1.307 2005/11/01 21:52:47 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -74,8 +74,7 @@ sub body_tag_start {
'onunload="'.&Apache::lonmenu::unloadevents().'" ';
if ($env{'browser.imagesuppress'} eq 'on') { $background=''; }
if ($background) {
- $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
- $background;
+ &Apache::lonxml::extlink($background);
$body_tag_start.='background="'.$background.'" ';
} else {
if (($bgcolor) && ($env{'browser.blackwhite'} ne 'on')) {
@@ -88,11 +87,10 @@ sub body_tag_start {
$body_tag_start.=' style="font-size: x-large;" ';
}
$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
+
+ &Apache::lontexconvert::jsMath_reset();
if ($env{'environment.texengine'} eq 'jsMath') {
- $body_tag_start.=''."\n".
- ''."\n";
+ $body_tag_start.=&Apache::lontexconvert::jsMath_header();
}
return $body_tag_start;
}
@@ -119,14 +117,16 @@ sub page_start {
my $body_tag_start;
if (!defined($found{'body'}) && $env{'request.state'} eq 'construct'
&& $env{'environment.remote'} eq 'off') {
- $body_tag_start=&Apache::loncommon::bodytag();
- $body_tag_start.=&Apache::lonxml::message_location();
+ if ($target eq 'web' || $target eq 'edit') {
+ $body_tag_start=&Apache::loncommon::bodytag();
+ $body_tag_start.=&Apache::lonxml::message_location();
+ }
} elsif (!defined($found{'body'})) {
my $background=&Apache::lonxml::get_param('background',$parstack,
$safeeval);
my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
$safeeval);
- $body_tag_start=&body_tag_start($background,$bgcolor);
+ $body_tag_start=&body_tag_start($target,$background,$bgcolor);
if ( ($target eq 'web' || $target eq 'webgrade')
&& $env{'request.state'} ne 'construct') {
my ($symb,undef,undef,undef,$publicuser)=
@@ -192,7 +192,7 @@ sub setup_rndseed {
delete($env{'form.newrandomization'});
}
if (defined($rndseed) && $rndseed ne int($rndseed)) {
- $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed));
+ $rndseed=join(':',&Apache::lonnet::digest($rndseed));
}
if ($Apache::lonhomework::history{'resource.CODE'}) {
$rndseed=&Apache::lonnet::rndseed();
@@ -435,6 +435,11 @@ sub init_problem_globals {
@Apache::inputtags::partlist=();
$Apache::lonhomework::problemstatus='';
$Apache::lonhomework::ignore_response_errors=1;
+ } elsif ($type eq 'Task') {
+ $Apache::inputtags::part='0';
+ @Apache::inputtags::partlist=('0');
+ $Apache::lonhomework::problemstatus='';
+ $Apache::lonhomework::ignore_response_errors=1;
}
@Apache::inputtags::responselist = ();
@Apache::inputtags::importlist = ();
@@ -510,7 +515,6 @@ sub start_problem {
defined($env{'form.problemtype'})) {
$Apache::lonhomework::type=$env{'form.problemtype'};
}
- $Apache::lonhomework::default_type = $Apache::lonhomework::type;
&Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:");
}
if ($Apache::lonhomework::type eq '' ) {
@@ -523,6 +527,7 @@ sub start_problem {
&Apache::lonxml::debug("Using default type, problem, :$uri:");
}
}
+ $Apache::lonhomework::default_type = $Apache::lonhomework::type;
#added vars to the scripting enviroment
my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
@@ -565,11 +570,12 @@ sub start_problem {
value="'.$env{'form.username'}.'" />';
if ($env{'user.adv'}) {
$form_tag_start.=
- ' '.&mt(' Show All Foils');
+ $form_tag_start.= ' />'.&mt(' Show All Foils').
+ '';
}
$form_tag_start.='
';
}
@@ -643,6 +649,10 @@ sub start_problem {
}
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
if (defined($maxtries) && $maxtries < 0) { $allow_print_points=0; }
+ if (lc($env{'course.'.$env{'request.course.id'}.
+ '.disableexampointprint'}) eq 'yes') {
+ $allow_print_points=0;
+ }
my $duedate = &Apache::lonnet::EXT("resource.$id.duedate");
$duedate = POSIX::strftime("%c",localtime($duedate));
my $temp_file;
@@ -656,14 +666,18 @@ sub start_problem {
my $due_file_content = $due_file_content[$#due_file_content];
chomp $due_file_content;
my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header');
+ my $begin_doc='\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$env{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent ';
+ my $toc_line='\vskip 1 mm\noindent '.$startminipage.
+ '\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
if ($due_file_content ne $duedate) {
$temp_file = Apache::File->new('>'.$filename);
print $temp_file "$duedate\n";
if (not $env{'request.symb'} =~ m/\.page_/) {
if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
- $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$env{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
+ $result .= $begin_doc.
+ '\textit{Due date: '.$duedate.'} '.$toc_line;
} else {
- $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$env{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
+ $result .= $begin_doc.$toc_line;
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
}
} else {
@@ -671,7 +685,7 @@ sub start_problem {
}
} else {
if (not $env{'request.symb'} =~ m/\.page_/) {
- $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$env{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
+ $result .= $begin_doc.$toc_line;
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
} else {
$result .= '\vskip 1mm \\\\\\\\';
@@ -1048,7 +1062,9 @@ sub start_randomlist {
if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' ||
$target eq 'tex' || $target eq 'analyze') {
my $body= &Apache::lonxml::get_all_text("/randomlist",$parser);
- my $b_parser= HTML::TokeParser->new(\$body);
+ my $b_parser= HTML::LCParser->new(\$body);
+ $b_parser->xml_mode(1);
+ $b_parser->marked_sections(1);
my $b_tok;
my @randomlist;
my $list_item;
@@ -1072,17 +1088,19 @@ sub start_randomlist {
# print "END-TAG $b_tok->[1]
";
# }
}
- my @idx_arr = (0 .. $#randomlist);
- &Apache::structuretags::shuffle(\@idx_arr);
- my $bodytext = '';
- my $show=$#randomlist;
- my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
- $showarg--;
- if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; }
- for(0 .. $show) {
- $bodytext .= "$randomlist[ $idx_arr[$_] ]";
+ if (@randomlist) {
+ my @idx_arr = (0 .. $#randomlist);
+ &Apache::structuretags::shuffle(\@idx_arr);
+ my $bodytext = '';
+ my $show=$#randomlist;
+ my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
+ $showarg--;
+ if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; }
+ for(0 .. $show) {
+ $bodytext .= "$randomlist[ $idx_arr[$_] ]";
+ }
+ &Apache::lonxml::newparser($parser,\$bodytext);
}
- &Apache::lonxml::newparser($parser,\$bodytext);
} elsif ($target eq 'edit' ) {
$result .=&Apache::edit::tag_start($target,$token);
$result .=&Apache::edit::text_arg('Maximum Tags to Show:','show',
@@ -1099,7 +1117,7 @@ sub start_randomlist {
sub shuffle {
my $a=shift;
my $i;
- if (defined(@$a)) {
+ if (ref($a) eq 'ARRAY' && @$a) {
&Apache::response::pushrandomnumber();
for($i=@$a;--$i;) {
my $j=int(&Math::Random::random_uniform() * ($i+1));
@@ -1135,7 +1153,7 @@ sub start_part {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
- if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+ if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }
$Apache::inputtags::part=$id;
push(@Apache::inputtags::partlist,$id);
@Apache::inputtags::response=();
@@ -1205,6 +1223,10 @@ sub start_part {
if (defined($maxtries) && $maxtries < 0) {
$allow_print_points=0;
}
+ if (lc($env{'course.'.$env{'request.course.id'}.
+ '.disableexampointprint'}) eq 'yes') {
+ $allow_print_points=0;
+ }
if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
} elsif ($target eq 'web') {
$result.='';
@@ -1270,7 +1292,8 @@ sub start_preduedate {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
&Apache::lonxml::debug("State in preduedate is ". $Apache::inputtags::status['-1']);
- if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
+ if (!$Apache::lonhomework::scantronmode &&
+ $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
&Apache::lonxml::debug("Wha? ". ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER'));
&Apache::lonxml::get_all_text("/preduedate",$parser);
@@ -1286,7 +1309,8 @@ sub end_preduedate {
sub start_postanswerdate {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web' || $target eq 'grade') {
- if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
+ if ($Apache::lonhomework::scantronmode ||
+ $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
&Apache::lonxml::get_all_text("/postanswerdate",$parser);
}
} elsif ($target eq 'tex') {