--- loncom/homework/structuretags.pm 2002/11/06 23:05:02 1.132 +++ loncom/homework/structuretags.pm 2002/12/05 14:37:17 1.141 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.132 2002/11/06 23:05:02 albertel Exp $ +# $Id: structuretags.pm,v 1.141 2002/12/05 14:37:17 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,6 +29,7 @@ # 6/26/2001 fixed extra web display at end of tags # 8/17,8/18,8/20 Gerd Kortemeyer + package Apache::structuretags; use strict; @@ -100,6 +101,14 @@ sub page_start { } } $body_tag_start.='>'; + if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { + my ($symb)=&Apache::lonxml::whichuser(); + if ($symb eq '') { + my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference"); + $help="Browsing or ambiguous reference, submissions ignored $help
"; + $body_tag_start.=$help; + } + } } my $form_tag_start; if (!defined($found{'form'})) { @@ -109,10 +118,12 @@ sub page_start { return ($result,$head_tag_start,$body_tag_start,$form_tag_start); } +#use Time::HiRes(); sub get_resource_name { my ($parstack,$safeeval)=@_; - my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval); - if ($name eq '') { + my $name=&Apache::lonnet::gettitle(); + &Apache::lonnet::logthis("Got $name"); + if ($name eq '') { $name=&Apache::lonnet::EXT('resource.title'); if ($name eq 'con_lost') { $name = ''; } } @@ -129,6 +140,7 @@ sub setup_rndseed { $rndseed=time; $ENV{'form.rndseed'}=$rndseed; } + &Apache::lonxml::debug("Setting rndseed to $rndseed"); &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); } return $rndseed; @@ -140,13 +152,13 @@ sub problem_edit_header {
- -

 

+ +

 

'; } sub problem_edit_footer { - return '
+ return '

'; } @@ -165,10 +177,9 @@ sub problem_web_to_edit_header {
'; my $numtoanalyze=$ENV{'form.numtoanalyze'}; if (!$numtoanalyze) { $numtoanalyze=100; } - #DISABLED for now. - #$result.= ' -#
'; + $result.= ' +
'; return $result; } @@ -272,6 +283,7 @@ sub start_problem { &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';} + if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); } if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { #handle exam checkout if ($Apache::lonhomework::type eq 'exam') { @@ -414,15 +426,15 @@ sub end_problem { $result.="\n"; } } - if ($target ne 'tex') { + if ($target eq 'web') { $result.=&Apache::lonxml::xmlend(); - } else { - $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; - if (not $ENV{'request.symb'} =~ m/\.page_/) { - $result .= '\end{minipage}\end{document} '; - } else { - $result .= ''; - } + } elsif ($target eq 'tex') { + $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; + if (not $ENV{'request.symb'} =~ m/\.page_/) { + $result .= '\end{minipage}\end{document} '; + } else { + $result .= ''; + } } } if ($target eq 'grade') { @@ -492,6 +504,9 @@ sub start_block { if ($code) { $code =~ s/\"//g; $code .=';return $condition;'; + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); + } $result = &Apache::run::run($code,$safeeval); &Apache::lonxml::debug("block :$code: returned :$result:"); } else { @@ -527,6 +542,9 @@ sub start_while { $code .=';return $condition;'; push( @Apache::structuretags::whileconds, $code); + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); + } my $result = &Apache::run::run($code,$safeeval); my $bodytext=$$parser[$#$parser]->get_text("/while"); push( @Apache::structuretags::whilebody, $bodytext); @@ -656,6 +674,19 @@ sub start_part { } } } + } elsif ($target eq 'edit') { + $result.=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::text_arg('Part ID:','id',$token). + &Apache::loncommon::help_open_topic("Part_Tag_Edit_Help"). + &Apache::edit::end_row().&Apache::edit::start_spanning_row(); + + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, + 'id'); + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + $result.=&Apache::edit::handle_insert(); + } } return $result; } @@ -664,24 +695,27 @@ sub end_part { 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 'web' || $target eq 'tex' ) { - my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,$target); + my $result=''; + if ( $target eq 'meta' ) { + $result=''; + } elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER') { + $result=&Apache::inputtags::grade; + } elsif ($target eq 'web' || $target eq 'tex' ) { + my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part, + $target); if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';} - return $gradestatus; + $result=$gradestatus; } - return ''; + pop @Apache::inputtags::status; + return $result; } sub start_preduedate { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && - $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) { + $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' && + $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]); } }