--- loncom/homework/structuretags.pm 2001/09/18 02:21:13 1.68
+++ loncom/homework/structuretags.pm 2001/12/04 14:53:59 1.73
@@ -68,7 +68,7 @@ sub initialize_storage {
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
if ($ENV{'request.state'} eq 'construct') {
%Apache::lonhomework::history=
- &Apache::lonnet::restore($ENV{'request.uri'},'nohist_construct',$domain,$name);
+ &Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name);
my ($temp)=keys %Apache::lonhomework::history ;
&Apache::lonxml::debug("Return message of $temp");
} else {
@@ -90,9 +90,8 @@ sub finalize_storage {
if ( $temp ne '' ) {
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
if ($ENV{'request.state'} eq 'construct') {
- $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
- $ENV{'request.uri'},'nohist_construct',
- $domain,$name);
+ $result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results,
+ $ENV{'request.uri'},'',$domain,$name);
&Apache::lonxml::debug('Construct Store return message:'.$result);
} else {
$result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
@@ -128,6 +127,9 @@ sub start_problem {
@Apache::inputtags::responselist = ();
@Apache::inputtags::previous=();
&initialize_storage();
+ 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:");
if ($Apache::lonhomework::type eq '') {
@@ -210,8 +212,12 @@ sub start_problem {
$result.=
'
+
Random Seed:
';
+ $rndseed.'" />
+
+
+ ';
}
# if we are viewing someone else preserve that info
if (defined $ENV{'form.grade_symb'}) {
@@ -233,6 +239,7 @@ sub start_problem {
+
';
@@ -379,49 +386,52 @@ sub end_while {
#
sub start_randomlist {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);
- my $b_parser= HTML::TokeParser->new(\$body);
- my $b_tok;
- my @randomlist;
- my $list_item;
-
- while($b_tok = $b_parser->get_token() ) {
- if($b_tok->[0] eq 'S') { # start tag
- # get content of the tag until matching end tag
- # get all text upto the matching tag
- # and push the content into @randomlist
- $list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser);
- $list_item = "$b_tok->[4]"."$list_item"."$b_tok->[1]>";
- push(@randomlist,$list_item);
- # print " START-TAG $b_tok->[1], $b_tok->[4], $list_item";
- }
- if($b_tok->[0] eq 'T') { # text
- # what to do with text in between tags?
- # print "TEXT $b_tok->[1] ";
- }
- # if($b_tok->[0] eq 'E') { # end tag, should not happen
+ if ($target eq 'answer' || $target eq 'grade' || $target eq 'web') {
+ my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);
+ my $b_parser= HTML::TokeParser->new(\$body);
+ my $b_tok;
+ my @randomlist;
+ my $list_item;
+ while($b_tok = $b_parser->get_token() ) {
+ if($b_tok->[0] eq 'S') { # start tag
+ # get content of the tag until matching end tag
+ # get all text upto the matching tag
+ # and push the content into @randomlist
+ $list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser);
+ $list_item = "$b_tok->[4]"."$list_item"."$b_tok->[1]>";
+ push(@randomlist,$list_item);
+ # print " START-TAG $b_tok->[1], $b_tok->[4], $list_item";
+ }
+ if($b_tok->[0] eq 'T') { # text
+ # what to do with text in between tags?
+ # print "TEXT $b_tok->[1] ";
+ }
+ # if($b_tok->[0] eq 'E') { # end tag, should not happen
# print "END-TAG $b_tok->[1] ";
- # }
- }
- my @idx_arr = (0 .. $#randomlist);
- &Apache::structuretags::shuffle(\@idx_arr);
- my $bodytext = '';
- for(0 .. $#randomlist) {
- $bodytext .= "$randomlist[ $idx_arr[$_] ]";
- }
+ # }
+ }
- &Apache::lonxml::newparser($parser,\$bodytext);
+ my @idx_arr = (0 .. $#randomlist);
+ &Apache::structuretags::shuffle(\@idx_arr);
+ my $bodytext = '';
+ for(0 .. $#randomlist) {
+ $bodytext .= "$randomlist[ $idx_arr[$_] ]";
+ }
+ &Apache::lonxml::newparser($parser,\$bodytext);
+ }
return "";
}
sub shuffle {
my $a=shift;
my $i;
- &Apache::response::setrandomnumber();
- for($i=@$a;--$i;) {
- my $j=int rand($i+1);
- next if $i == $j;
- @$a[$i,$j] = @$a[$j,$i];
+ if (defined(@$a)) {
+ &Apache::response::setrandomnumber();
+ for($i=@$a;--$i;) {
+ my $j=int rand($i+1);
+ next if $i == $j;
+ @$a[$i,$j] = @$a[$j,$i];
+ }
}
}
@@ -542,7 +552,7 @@ sub end_startouttext {
my $text='';
if ($target eq 'edit') {
- $text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]);
+ $text=&Apache::lonxml::get_all_text("endouttext",$$parser[-1]);
$result.=&Apache::edit::start_table($token)."
Text Block
Delete:".
&Apache::edit::deletelist($target,$token)
@@ -576,13 +586,13 @@ sub delete_startouttext {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
# my $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
my $text=$$parser['-1']->get_text("/endouttext");
- my $token=$$parser['-1']->get_token();
- &Apache::lonxml::debug("Deleting :$text: and :$token->[0]:$token->[1]:$token->[2]: for startouttext");
- &Apache::lonxml::end_tag($tagstack,$parstack,$token);
+ my $ntoken=$$parser['-1']->get_token();
+ &Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext");
+ &Apache::lonxml::end_tag($tagstack,$parstack,$ntoken);
# Deleting 2 parallel tag pairs, but we need the numbers later to look like
# they did the last time round
- &Apache::lonxml::increasedepth($token);
- &Apache::lonxml::decreasedepth($token);
+ &Apache::lonxml::increasedepth($ntoken);
+ &Apache::lonxml::decreasedepth($ntoken);
return 1;
}