version 1.81, 2002/02/08 20:58:39
|
version 1.89, 2002/04/10 19:58:19
|
Line 79 sub page_start {
|
Line 79 sub page_start {
|
if (!defined($found{'html'})) { |
if (!defined($found{'html'})) { |
$result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack, |
$result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack, |
$parser,$safeeval); |
$parser,$safeeval); |
$head_tag_start='<head>'.&Apache::lonxml::registerurl(); |
$head_tag_start='<head>'.&Apache::lonxml::registerurl(undef,$target); |
} |
} |
my $body_tag_start; |
my $body_tag_start; |
if (!defined($found{'body'})) { |
if (!defined($found{'body'})) { |
Line 174 sub start_problem {
|
Line 174 sub start_problem {
|
$Apache::inputtags::part='0'; |
$Apache::inputtags::part='0'; |
@Apache::inputtags::responselist = (); |
@Apache::inputtags::responselist = (); |
@Apache::inputtags::previous=(); |
@Apache::inputtags::previous=(); |
&initialize_storage(); |
if ($target ne 'analyze') { |
if ($target eq 'web') { |
&initialize_storage(); |
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
if ($target eq 'web') { |
|
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
|
} |
|
$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); |
|
&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); |
} |
} |
$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); |
|
&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); |
|
if ($Apache::lonhomework::type eq '') { |
if ($Apache::lonhomework::type eq '') { |
my $uri=$ENV{'request.uri'}; |
my $uri=$ENV{'request.uri'}; |
if ($uri=~/\.(\w+)$/) { |
if ($uri=~/\.(\w+)$/) { |
Line 297 sub start_problem {
|
Line 299 sub start_problem {
|
$result=$token->[4]; |
$result=$token->[4]; |
$result.=&Apache::edit::handle_insert(); |
$result.=&Apache::edit::handle_insert(); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$result .= '\begin{document}\noindent\textbf{Problem.}\newline'; |
$result .= '\begin{document} '; |
} else { |
} else { |
# page_start returned a starting result, delete it if we don't need it |
# page_start returned a starting result, delete it if we don't need it |
$result = ''; |
$result = ''; |
Line 310 sub end_problem {
|
Line 312 sub end_problem {
|
my $result=''; |
my $result=''; |
my $status=$Apache::inputtags::status['-1']; |
my $status=$Apache::inputtags::status['-1']; |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ) { |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ) { |
if ( $target eq 'grade' && $Apache::inputtags::part eq '0' && |
if ( $target eq 'grade' && $Apache::inputtags::part eq '0') { |
$status eq 'CAN_ANSWER') { |
|
# if part is zero, no <part>s existed, so we need to the grading |
# if part is zero, no <part>s existed, so we need to the grading |
&Apache::inputtags::grade; |
&Apache::inputtags::grade; |
} elsif ( $target eq 'web' && $Apache::inputtags::part eq '0') { |
} elsif ( $target eq 'web' && $Apache::inputtags::part eq '0') { |
Line 337 sub end_problem {
|
Line 338 sub end_problem {
|
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
if ($Apache::inputtags::part eq '0') { |
if ($Apache::inputtags::part eq '0') { |
$result=&Apache::response::mandatory_part_meta; |
$result=&Apache::response::mandatory_part_meta; |
|
} else { |
|
# there were intervening parts need to set the global temporarily |
|
# and only need the package reference |
|
my $temp=$Apache::inputtags::part; |
|
$Apache::inputtags::part=0; |
|
$result=&Apache::response::meta_package_write('part'); |
|
$Apache::inputtags::part=$temp; |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
&Apache::lonxml::debug("in end_problem with $target, edit"); |
&Apache::lonxml::debug("in end_problem with $target, edit"); |
$result='<br /><input type="submit" name="submit" value="Submit Changes" />'; |
$result='<br /><input type="submit" name="submit" value="Submit Changes" />'; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$result .= '\end{document}'; |
$result .= '\vskip 0.5mm\noindent\makebox[9.0cm][b]{\hrulefill}\end{document}'; |
} |
} |
return $result; |
return $result; |
} |
} |
Line 438 sub end_while {
|
Line 446 sub end_while {
|
# </randomlist> |
# </randomlist> |
sub start_randomlist { |
sub start_randomlist { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $result; |
if ($target eq 'answer' || $target eq 'grade' || $target eq 'web') { |
if ($target eq 'answer' || $target eq 'grade' || $target eq 'web') { |
my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]); |
my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]); |
my $b_parser= HTML::TokeParser->new(\$body); |
my $b_parser= HTML::TokeParser->new(\$body); |
Line 462 sub start_randomlist {
|
Line 471 sub start_randomlist {
|
# print "<b>END-TAG $b_tok->[1]</b><br />"; |
# print "<b>END-TAG $b_tok->[1]</b><br />"; |
# } |
# } |
} |
} |
|
|
my @idx_arr = (0 .. $#randomlist); |
my @idx_arr = (0 .. $#randomlist); |
&Apache::structuretags::shuffle(\@idx_arr); |
&Apache::structuretags::shuffle(\@idx_arr); |
my $bodytext = ''; |
my $bodytext = ''; |
for(0 .. $#randomlist) { |
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[$_] ]"; |
$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',$token,5); |
|
$result .= &Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
|
} elsif ($target eq 'modified' ) { |
|
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, |
|
'show'); |
|
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} |
} |
return ""; |
return $result; |
} |
} |
|
|
sub shuffle { |
sub shuffle { |
Line 488 sub shuffle {
|
Line 508 sub shuffle {
|
} |
} |
|
|
sub end_randomlist { |
sub end_randomlist { |
return ''; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $result; |
|
if ($target eq 'edit' ) { |
|
$result=&Apache::edit::tag_end($target,$token,'End Randomly Parsed Block'); |
|
} |
|
return $result; |
} |
} |
|
|
sub start_part { |
sub start_part { |
Line 608 sub end_startouttext {
|
Line 633 sub end_startouttext {
|
$result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td> |
$result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td> |
<td>Delete:". |
<td>Delete:". |
&Apache::edit::deletelist($target,$token) |
&Apache::edit::deletelist($target,$token) |
."</td> |
."</td> |
<td>". |
<td>". |
&Apache::edit::insertlist($target,$token). |
&Apache::edit::insertlist($target,$token). |
"</td> |
&Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n". |
</tr><tr><td colspan=\"3\">\n". |
&Apache::edit::editfield($token->[1],$text,"",50,4); |
&Apache::edit::editfield($token->[1],$text,"",50,4); |
|
} |
} |
if ($target eq 'modified') { |
if ($target eq 'modified') { |
$text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); |
$text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); |
$result='<startouttext />'.&Apache::edit::modifiedfield(); |
$result='<startouttext />'.&Apache::edit::modifiedfield(); |
} |
} |
|
if ($target eq 'tex') { |
|
$result .= '\noindent '; |
|
} |
return $result; |
return $result; |
} |
} |
sub start_endouttext { |
sub start_endouttext { |