--- loncom/homework/structuretags.pm 2001/10/13 05:59:18 1.70
+++ loncom/homework/structuretags.pm 2002/01/24 04:18:54 1.78
@@ -1,5 +1,30 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
+#
+# $Id: structuretags.pm,v 1.78 2002/01/24 04:18:54 harris41 Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
# 2/19 Guy
# 6/26/2001 fixed extra web display at end of tags
# 8/17,8/18,8/20 Gerd Kortemeyer
@@ -9,7 +34,7 @@ package Apache::structuretags;
use strict;
use Apache::lonnet;
-sub BEGIN {
+BEGIN {
&Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
# &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate'))
}
@@ -68,7 +93,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 +115,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 +152,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 +237,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 +264,7 @@ sub start_problem {
+
';
@@ -241,6 +273,8 @@ sub start_problem {
} elsif ($target eq 'modified') {
$result=$token->[4];
$result.=&Apache::edit::handle_insert();
+ } elsif ($target eq 'tex') {
+ $result .= '\begin{document}\noindent\textbf{Problem.}\newline';
} else {
# page_start returned a starting result, delete it if we don't need it
$result = '';
@@ -284,6 +318,8 @@ sub end_problem {
} elsif ($target eq 'edit') {
&Apache::lonxml::debug("in end_problem with $target, edit");
$result=' ';
+ } elsif ($target eq 'tex') {
+ $result .= '\end{document}';
}
return $result;
}
@@ -379,38 +415,39 @@ 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 "";
}