version 1.127, 2002/10/15 14:37:59
|
version 1.140, 2002/12/02 17:15:07
|
Line 29
|
Line 29
|
# 6/26/2001 fixed extra web display at end of <web></web> tags |
# 6/26/2001 fixed extra web display at end of <web></web> tags |
# 8/17,8/18,8/20 Gerd Kortemeyer |
# 8/17,8/18,8/20 Gerd Kortemeyer |
|
|
|
|
package Apache::structuretags; |
package Apache::structuretags; |
|
|
use strict; |
use strict; |
Line 100 sub page_start {
|
Line 101 sub page_start {
|
} |
} |
} |
} |
$body_tag_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 <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored $help<br />"; |
|
$body_tag_start.=$help; |
|
} |
|
} |
} |
} |
my $form_tag_start; |
my $form_tag_start; |
if (!defined($found{'form'})) { |
if (!defined($found{'form'})) { |
Line 109 sub page_start {
|
Line 118 sub page_start {
|
return ($result,$head_tag_start,$body_tag_start,$form_tag_start); |
return ($result,$head_tag_start,$body_tag_start,$form_tag_start); |
} |
} |
|
|
|
use Time::HiRes(); |
sub get_resource_name { |
sub get_resource_name { |
my ($parstack,$safeeval)=@_; |
my ($parstack,$safeeval)=@_; |
my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name=&Apache::lonnet::gettitle(); |
if ($name eq '') { |
&Apache::lonnet::logthis("Got $name"); |
|
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 = ''; } |
} |
} |
Line 129 sub setup_rndseed {
|
Line 140 sub setup_rndseed {
|
$rndseed=time; |
$rndseed=time; |
$ENV{'form.rndseed'}=$rndseed; |
$ENV{'form.rndseed'}=$rndseed; |
} |
} |
|
&Apache::lonxml::debug("Setting rndseed to $rndseed"); |
&Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); |
&Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); |
} |
} |
return $rndseed; |
return $rndseed; |
Line 140 sub problem_edit_header {
|
Line 152 sub problem_edit_header {
|
<input type="submit" name="problemmode" value="Discard Edits and View" /> |
<input type="submit" name="problemmode" value="Discard Edits and View" /> |
<input type="submit" name="problemmode" value="EditXML" /> |
<input type="submit" name="problemmode" value="EditXML" /> |
<input type="submit" name="Undo" value="undo" /> <hr /> |
<input type="submit" name="Undo" value="undo" /> <hr /> |
<input type="submit" name="submit" value="Submit Changes" /> |
<input type="submit" name="submit" value="Submit Changes and Edit" /> |
<input type="submit" name="submit" value="Submit Changes and View" /><br /> |
<input type="submit" name="submit" value="Submit Changes and View" /><br /><p> </p><table border="0"><tr><td bgcolor="#DDDDDD"> |
'; |
'; |
} |
} |
|
|
sub problem_edit_footer { |
sub problem_edit_footer { |
return '<br /><input type="submit" name="submit" value="Submit Changes and Edit" /> |
return '</td></tr></table><br /><input type="submit" name="submit" value="Submit Changes and Edit" /> |
<input type="submit" name="submit" value="Submit Changes and View" />'; |
<input type="submit" name="submit" value="Submit Changes and View" />'; |
} |
} |
|
|
Line 165 sub problem_web_to_edit_header {
|
Line 177 sub problem_web_to_edit_header {
|
<hr />'; |
<hr />'; |
my $numtoanalyze=$ENV{'form.numtoanalyze'}; |
my $numtoanalyze=$ENV{'form.numtoanalyze'}; |
if (!$numtoanalyze) { $numtoanalyze=100; } |
if (!$numtoanalyze) { $numtoanalyze=100; } |
#DISABLED for now. |
$result.= '<input type="submit" name="problemmode" value="Answer Distribution" /> |
#$result.= '<input type="submit" name="problemmode" value="Answer Distribution" /> |
<input type="text" name="numtoanalyze" value="'. |
# <input type="text" name="numtoanalyze" value="'. |
$numtoanalyze.'" size="5" /> <hr />'; |
# $numtoanalyze.'" size="5" /> <hr />'; |
return $result; |
} |
} |
|
|
sub initialize_storage { |
sub initialize_storage { |
Line 271 sub start_problem {
|
Line 283 sub start_problem {
|
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';} |
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') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { |
#handle exam checkout |
#handle exam checkout |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
Line 289 sub start_problem {
|
Line 302 sub start_problem {
|
my $expression='$external::datestatus="'.$status.'";'; |
my $expression='$external::datestatus="'.$status.'";'; |
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; |
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; |
&Apache::run::run($expression,$safeeval); |
&Apache::run::run($expression,$safeeval); |
|
&Apache::lonxml::debug("Got $status"); |
if (( $status eq 'CLOSED' ) || |
if (( $status eq 'CLOSED' ) || |
( $status eq 'UNCHECKEDOUT') || |
( $status eq 'UNCHECKEDOUT') || |
( $status eq 'BANNED')) { |
( $status eq 'BANNED')) { |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]); |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); |
if ( $target eq "web" ) { |
if ( $target eq "web" ) { |
$result.= $head_tag_start.'</head>'; |
$result.= $head_tag_start.'</head>'; |
my $msg=$body_tag_start. |
my $msg=$body_tag_start. |
Line 412 sub end_problem {
|
Line 426 sub end_problem {
|
$result.="</body>\n"; |
$result.="</body>\n"; |
} |
} |
} |
} |
if ($target ne 'tex') { |
if ($target eq 'web') { |
$result.=&Apache::lonxml::xmlend(); |
$result.=&Apache::lonxml::xmlend(); |
} else { |
} elsif ($target eq 'tex') { |
$result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; |
$result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; |
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
$result .= '\end{minipage}\end{document} '; |
$result .= '\end{minipage}\end{document} '; |
} else { |
} else { |
$result .= ''; |
$result .= ''; |
} |
} |
} |
} |
} |
} |
if ($target eq 'grade') { |
if ($target eq 'grade') { |
Line 480 sub end_library {
|
Line 494 sub end_library {
|
} |
} |
|
|
sub start_block { |
sub start_block { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
|
|
my $result; |
|
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
my $code = @$parstack[$#$parstack]; |
$target eq 'tex' || $target eq 'analyze') { |
$code =~ s/\"//g; |
my $code = @$parstack[$#$parstack]; |
$code .=';return $condition;'; |
if ($code) { |
# print "<br />$code<br />"; |
$code =~ s/\"//g; |
my $result = &Apache::run::run($code,$safeeval); |
$code .=';return $condition;'; |
&Apache::lonxml::debug("block :$code: returned :$result:"); |
if (!$Apache::lonxml::default_homework_loaded) { |
if ( ! $result ) { |
&Apache::lonxml::default_homework_load($safeeval); |
my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]); |
} |
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]"); |
$result = &Apache::run::run($code,$safeeval); |
|
&Apache::lonxml::debug("block :$code: returned :$result:"); |
|
} else { |
|
$result='1'; |
|
} |
|
if ( ! $result ) { |
|
my $skip=&Apache::lonxml::get_all_text("/block",$$parser[-1]); |
|
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); |
|
} |
|
$result=''; |
|
} elsif ($target eq 'edit') { |
|
$result .=&Apache::edit::tag_start($target,$token); |
|
$result .=&Apache::edit::text_arg('Test Condition:','condition', |
|
$token,40); |
|
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
|
$safeeval,'condition'); |
|
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} |
} |
} |
return $result; |
return ""; |
|
} |
} |
|
|
sub end_block { |
sub end_block { |
Line 509 sub start_while {
|
Line 542 sub start_while {
|
$code .=';return $condition;'; |
$code .=';return $condition;'; |
|
|
push( @Apache::structuretags::whileconds, $code); |
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 $result = &Apache::run::run($code,$safeeval); |
my $bodytext=$$parser[$#$parser]->get_text("/while"); |
my $bodytext=$$parser[$#$parser]->get_text("/while"); |
push( @Apache::structuretags::whilebody, $bodytext); |
push( @Apache::structuretags::whilebody, $bodytext); |
Line 633 sub start_part {
|
Line 669 sub start_part {
|
} |
} |
} else { |
} else { |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$result='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; |
if ($$tagstack[-2] ne 'problem') { |
|
$result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; |
|
} |
} |
} |
} |
} |
|
} 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; |
return $result; |
} |
} |
Line 644 sub end_part {
|
Line 695 sub end_part {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
&Apache::lonxml::debug("in end_part $target "); |
&Apache::lonxml::debug("in end_part $target "); |
my $status=$Apache::inputtags::status['-1']; |
my $status=$Apache::inputtags::status['-1']; |
pop @Apache::inputtags::status; |
my $result=''; |
if ( $target eq 'meta' ) { return ''; } |
if ( $target eq 'meta' ) { |
if ( $target eq 'grade' && $status eq 'CAN_ANSWER') { |
$result=''; |
return &Apache::inputtags::grade; |
} elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER') { |
} |
$result=&Apache::inputtags::grade; |
if ($target eq 'web' || $target eq 'tex' ) { |
} elsif ($target eq 'web' || $target eq 'tex' ) { |
my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,$target); |
my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part, |
|
$target); |
if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';} |
if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';} |
return $gradestatus; |
$result=$gradestatus; |
} |
} |
return ''; |
pop @Apache::inputtags::status; |
|
return $result; |
} |
} |
|
|
sub start_preduedate { |
sub start_preduedate { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { |
if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && |
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]); |
&Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]); |
} |
} |
} |
} |
Line 755 sub start_endouttext {
|
Line 809 sub start_endouttext {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result=''; |
my $result=''; |
if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; } |
if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; } |
if ($target eq "modified") { $result='<endouttext />'; } |
if ($target eq "modified") { |
|
$result='<endouttext />'. |
|
&Apache::edit::handle_insertafter('startouttext'); } |
return $result; |
return $result; |
} |
} |
sub end_endouttext { |
sub end_endouttext { |