version 1.198, 2003/07/17 18:42:13
|
version 1.208, 2003/09/05 02:31:49
|
Line 44 BEGIN {
|
Line 44 BEGIN {
|
|
|
sub start_web { |
sub start_web { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if (!($target eq 'web' || $target eq 'edit' || $target eq 'modified' || |
my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); |
$target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) { |
if ($target eq 'web') { |
my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); |
return $bodytext; |
} |
} |
return ''; |
return ''; |
} |
} |
Line 58 sub end_web {
|
Line 58 sub end_web {
|
sub start_tex { |
sub start_tex { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result=''; |
my $result=''; |
if (!($target eq 'edit' || $target eq 'modified' || |
my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); |
$target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) { |
if ($target eq 'tex') { |
&Apache::lonxml::debug("tex 1"); |
return $bodytext.' '; |
my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); |
|
} elsif ($target eq 'tex') { |
|
$result=&Apache::lonxml::get_all_text("/tex",$parser); |
|
} |
} |
return $result;; |
return $result;; |
} |
} |
Line 75 sub end_tex {
|
Line 72 sub end_tex {
|
sub page_start { |
sub page_start { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my %found; |
my %found; |
foreach my $taginside ($tagstack) { |
foreach my $taginside (@$tagstack) { |
foreach my $taglookedfor ('html','body','form') { |
foreach my $taglookedfor ('html','body','form') { |
if ($taginside =~ /^$taglookedfor$/i) {$found{$taglookedfor} = 1;} |
if ($taginside =~ /^$taglookedfor$/i) {$found{$taglookedfor} = 1;} |
} |
} |
Line 94 sub page_start {
|
Line 91 sub page_start {
|
'onUnload="'.&Apache::lonmenu::unloadevents().'" '; |
'onUnload="'.&Apache::lonmenu::unloadevents().'" '; |
my $background=&Apache::lonxml::get_param('background',$parstack, |
my $background=&Apache::lonxml::get_param('background',$parstack, |
$safeeval); |
$safeeval); |
|
if ($ENV{'browser.imagesuppress'} eq 'on') { $background=''; } |
if ($background) { |
if ($background) { |
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= |
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= |
$background; |
$background; |
Line 101 sub page_start {
|
Line 99 sub page_start {
|
} else { |
} else { |
my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack, |
my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack, |
$safeeval); |
$safeeval); |
if ($bgcolor) { |
if (($bgcolor) && ($ENV{'browser.blackwhite'} ne 'on')) { |
$body_tag_start.='bgcolor="'.$bgcolor.'" '; |
$body_tag_start.='bgcolor="'.$bgcolor.'" '; |
} else { |
} else { |
$body_tag_start.='bgcolor="#ffffff"'; |
$body_tag_start.='bgcolor="#ffffff"'; |
} |
} |
} |
} |
|
if ($ENV{'browser.fontenhance'} eq 'on') { |
|
$body_tag_start.=' style="font-size: x-large;" '; |
|
} |
$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1); |
$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1); |
if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { |
if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { |
my ($symb,undef,undef,undef,$publicuser)= |
my ($symb,undef,undef,undef,$publicuser)= |
Line 129 sub page_start {
|
Line 130 sub page_start {
|
#use Time::HiRes(); |
#use Time::HiRes(); |
sub get_resource_name { |
sub get_resource_name { |
my ($parstack,$safeeval)=@_; |
my ($parstack,$safeeval)=@_; |
|
if (defined($Apache::lonhomework::name)) { |
|
return $Apache::lonhomework::name; |
|
} |
my $name=&Apache::lonnet::gettitle(); |
my $name=&Apache::lonnet::gettitle(); |
if ($name eq '') { |
if ($name eq '') { |
$name=&Apache::lonnet::EXT('resource.title'); |
$name=&Apache::lonnet::EXT('resource.title'); |
if ($name eq 'con_lost') { $name = ''; } |
if ($name eq 'con_lost') { $name = ''; } |
} |
} |
|
if ($name!~/\S+/) { |
|
$name=$ENV{'request.uri'}; |
|
$name=~s-.*/([^/]+)$-$1-; |
|
} |
$Apache::lonhomework::name=$name; |
$Apache::lonhomework::name=$name; |
return $name; |
return $name; |
} |
} |
Line 267 credit even if done erroneously.<p />
|
Line 275 credit even if done erroneously.<p />
|
ENDCHECKOUT |
ENDCHECKOUT |
} |
} |
|
|
|
sub init_problem_globals { |
|
my ($type)=@_; |
|
#initialize globals |
|
if ($type eq 'problem') { |
|
$Apache::inputtags::part='0'; |
|
@Apache::inputtags::partlist=('0'); |
|
$Apache::lonhomework::problemstatus= |
|
&Apache::lonnet::EXT('resource.0.problemstatus'); |
|
} else { |
|
$Apache::inputtags::part=''; |
|
@Apache::inputtags::partlist=(); |
|
$Apache::lonhomework::problemstatus=''; |
|
} |
|
@Apache::inputtags::responselist = (); |
|
@Apache::inputtags::importlist = (); |
|
@Apache::inputtags::previous=(); |
|
@Apache::inputtags::previous_version=(); |
|
$Apache::structuretags::printanswer='No'; |
|
@Apache::structuretags::whileconds=(); |
|
@Apache::structuretags::whilebody=(); |
|
@Apache::structuretags::whileline=(); |
|
$Apache::lonhomework::scantronmode=0; |
|
undef($Apache::lonhomework::name); |
|
|
|
} |
|
|
|
sub reset_problem_globals { |
|
my ($type)=@_; |
|
undef(%Apache::lonhomework::history); |
|
undef(%Apache::lonhomework::results); |
|
undef($Apache::inputtags::part); |
|
#don't undef this, lonhomework.pm takes care of this, we use this to |
|
#detect if we try to do 2 problems in one file |
|
# undef($Apache::lonhomework::parsing_a_problem); |
|
undef($Apache::lonhomework::name); |
|
} |
|
|
sub start_problem { |
sub start_problem { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
|
Line 278 sub start_problem {
|
Line 323 sub start_problem {
|
} |
} |
|
|
$Apache::lonhomework::parsing_a_problem=1; |
$Apache::lonhomework::parsing_a_problem=1; |
#initialize globals |
&init_problem_globals('problem'); |
$Apache::inputtags::part='0'; |
|
@Apache::inputtags::partlist=('0'); |
|
@Apache::inputtags::responselist = (); |
|
@Apache::inputtags::importlist = (); |
|
@Apache::inputtags::previous=(); |
|
@Apache::inputtags::previous_version=(); |
|
$Apache::structuretags::printanswer='No'; |
|
@Apache::structuretags::whileconds=(); |
|
@Apache::structuretags::whilebody=(); |
|
@Apache::structuretags::whileline=(); |
|
$Apache::lonhomework::scantronmode=0; |
|
$Apache::lonhomework::problemstatus= |
|
&Apache::lonnet::EXT('resource.0.problemstatus'); |
|
|
|
if (defined($ENV{'scantron.maxquest'})) { |
if (defined($ENV{'scantron.maxquest'})) { |
$Apache::lonhomework::scantronmode=1; |
$Apache::lonhomework::scantronmode=1; |
Line 413 sub start_problem {
|
Line 445 sub start_problem {
|
if (not $ENV{'form.problem_split'}=~/yes/) { |
if (not $ENV{'form.problem_split'}=~/yes/) { |
$startminipage = '\begin{minipage}{\textwidth}'; |
$startminipage = '\begin{minipage}{\textwidth}'; |
} |
} |
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); |
|
if ($name eq '') { |
|
$name=&Apache::lonnet::EXT('resource.title'); |
|
if ($name eq 'con_lost') { $name = ''; } |
|
} |
|
$Apache::lonhomework::name=$name; |
|
my $id = $Apache::inputtags::part; |
my $id = $Apache::inputtags::part; |
my $weight = &Apache::lonnet::EXT("resource.$id.weight"); |
my $weight = &Apache::lonnet::EXT("resource.$id.weight"); |
my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'keys'); |
my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'keys'); |
Line 447 sub start_problem {
|
Line 473 sub start_problem {
|
print $temp_file "$duedate\n"; |
print $temp_file "$duedate\n"; |
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') { |
if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') { |
$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage; |
$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}'; |
} else { |
} else { |
$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage; |
$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}'; |
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
} |
} |
} else { |
} else { |
Line 457 sub start_problem {
|
Line 483 sub start_problem {
|
} |
} |
} else { |
} else { |
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage; |
$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}'; |
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
} else { |
} else { |
$result .= '\vskip 1mm \\\\\\\\'; |
$result .= '\vskip 1mm \\\\\\\\'; |
Line 550 sub end_problem {
|
Line 576 sub end_problem {
|
if ($ENV{'request.state'} eq 'construct' && $target eq 'web') { |
if ($ENV{'request.state'} eq 'construct' && $target eq 'web') { |
&Apache::inputtags::check_for_duplicate_ids(); |
&Apache::inputtags::check_for_duplicate_ids(); |
} |
} |
undef(%Apache::lonhomework::history); |
|
undef(%Apache::lonhomework::results); |
&reset_problem_globals('problem'); |
undef($Apache::inputtags::part); |
|
undef($Apache::lonhomework::parsing_a_problem); |
|
|
|
return $result; |
return $result; |
} |
} |
Line 562 sub end_problem {
|
Line 586 sub end_problem {
|
sub start_library { |
sub start_library { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($result,$head_tag_start,$body_tag_start,$form_tag_start); |
my ($result,$head_tag_start,$body_tag_start,$form_tag_start); |
|
if ($$tagstack[0] eq 'library') { &init_problem_globals('library') }; |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
($result,$head_tag_start,$body_tag_start,$form_tag_start)= |
($result,$head_tag_start,$body_tag_start,$form_tag_start)= |
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
Line 596 sub end_library {
|
Line 620 sub end_library {
|
$ENV{'request.state'} eq "construct") { |
$ENV{'request.state'} eq "construct") { |
$result.='</form></body>'.&Apache::lonxml::xmlend(); |
$result.='</form></body>'.&Apache::lonxml::xmlend(); |
} |
} |
|
if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') }; |
return $result; |
return $result; |
} |
} |
|
|
Line 624 sub end_definetag {
|
Line 649 sub end_definetag {
|
} |
} |
|
|
sub start_block { |
sub start_block { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
my $result; |
my $result; |
|
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
$target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
my $code = $token->[2]->{'condition'}; |
my $code = $token->[2]->{'condition'}; |
if ($code) { |
if (defined($code)) { |
if (!$Apache::lonxml::default_homework_loaded) { |
if (!$Apache::lonxml::default_homework_loaded) { |
&Apache::lonxml::default_homework_load($safeeval); |
&Apache::lonxml::default_homework_load($safeeval); |
} |
} |
Line 641 sub start_block {
|
Line 666 sub start_block {
|
$result='1'; |
$result='1'; |
} |
} |
if ( ! $result ) { |
if ( ! $result ) { |
my $skip=&Apache::lonxml::get_all_text("/block",$parser); |
my $skip=&Apache::lonxml::get_all_text("/block",$parser,$style); |
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); |
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); |
} |
} |
$result=''; |
$result=''; |
Line 668 sub end_block {
|
Line 693 sub end_block {
|
} |
} |
|
|
sub start_languageblock { |
sub start_languageblock { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
my $result; |
my $result; |
|
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
$target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
&Apache::lonxml::startredirection(); |
my $include = $token->[2]->{'include'}; |
|
my $exclude = $token->[2]->{'exclude'}; |
|
my %languages=&Apache::loncommon::display_languages(); |
|
$result='1'; |
|
if ($include) { |
|
$result=''; |
|
foreach (split(/\,/,$include)) { |
|
if ($languages{$_}) { $result='1'; } |
|
} |
|
} |
|
if ($exclude) { |
|
foreach (split(/\,/,$exclude)) { |
|
if ($languages{$_}) { $result='0'; } |
|
} |
|
} |
|
if ( ! $result ) { |
|
my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser, |
|
$style); |
|
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); |
|
} |
|
$result=''; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .=&Apache::edit::tag_start($target,$token); |
$result .=&Apache::edit::tag_start($target,$token); |
$result .=&Apache::edit::text_arg('Include Language:','include', |
$result .=&Apache::edit::text_arg('Include Language:','include', |
Line 694 sub start_languageblock {
|
Line 739 sub start_languageblock {
|
sub end_languageblock { |
sub end_languageblock { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result; |
my $result; |
|
if ($target eq "edit") { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
|
$target eq 'tex' || $target eq 'analyze') { |
|
my $text=&Apache::lonxml::endredirection(); |
|
my $include= &Apache::lonxml::get_param('include',$parstack,$safeeval); |
|
my $exclude= &Apache::lonxml::get_param('exclude',$parstack,$safeeval); |
|
my %languages=&Apache::loncommon::display_languages(); |
|
$result='1'; |
|
if ($include) { |
|
$result=''; |
|
foreach (split(/\,/,$include)) { |
|
if ($languages{$_}) { $result='1'; } |
|
} |
|
} |
|
if ($exclude) { |
|
foreach (split(/\,/,$exclude)) { |
|
if ($languages{$_}) { $result='0'; } |
|
} |
|
} |
|
if ( ! $result ) { |
|
$result=''; |
|
} else { |
|
$result=$text; |
|
} |
|
} elsif ($target eq "edit") { |
|
$result.= &Apache::edit::tag_end($target,$token,''); |
$result.= &Apache::edit::tag_end($target,$token,''); |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
sub start_instructorcomment { |
sub start_instructorcomment { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
my $result; |
my $result; |
|
|
Line 733 sub start_instructorcomment {
|
Line 754 sub start_instructorcomment {
|
$target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
$result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/); |
$result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/); |
if ( ! $result ) { |
if ( ! $result ) { |
my $skip=&Apache::lonxml::get_all_text("/instructorcomment",$parser); |
my $skip=&Apache::lonxml::get_all_text("/instructorcomment", |
|
$parser,$style); |
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); |
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); |
} |
} |
$result=''; |
$result=''; |