--- loncom/homework/structuretags.pm 2001/10/13 05:59:18 1.70
+++ loncom/homework/structuretags.pm 2002/04/01 18:22:33 1.88
@@ -1,5 +1,30 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
+#
+# $Id: structuretags.pm,v 1.88 2002/04/01 18:22:33 sakharuk 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'))
}
@@ -42,24 +67,39 @@ sub end_tex {
sub page_start {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval);
- my $head_tag_start='
'.&Apache::lonxml::registerurl();
- my $body_tag_start=''.&Apache::lonxml::registerurl(undef,$target);
+ }
+ my $body_tag_start;
+ if (!defined($found{'body'})) {
+ $body_tag_start='';
}
- $body_tag_start.='>';
return ($result,$head_tag_start,$body_tag_start);
}
@@ -68,7 +108,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 +130,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,
@@ -123,13 +162,26 @@ ENDCHECKOUT
sub start_problem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ # meta is called from lonpublisher, which doesn't uses the normal
+ # lonhomework method of parsing the file which means that inputtags
+ # won't get reset
+ if ( $Apache::inputtags::part ne '' && $target != 'meta' ) {
+ &Apache::lonxml::error('Only one problem allowed in a .problem file');
+ my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[-1]);
+ return '';
+ }
#intialize globals
$Apache::inputtags::part='0';
@Apache::inputtags::responselist = ();
@Apache::inputtags::previous=();
- &initialize_storage();
- $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
- &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
+ if ($target ne 'analyze') {
+ &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 '') {
my $uri=$ENV{'request.uri'};
if ($uri=~/\.(\w+)$/) {
@@ -210,8 +262,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 +289,7 @@ sub start_problem {
+
';
@@ -241,6 +298,8 @@ sub start_problem {
} elsif ($target eq 'modified') {
$result=$token->[4];
$result.=&Apache::edit::handle_insert();
+ } elsif ($target eq 'tex') {
+ $result .= '\begin{document} ';
} else {
# page_start returned a starting result, delete it if we don't need it
$result = '';
@@ -253,8 +312,7 @@ sub end_problem {
my $result='';
my $status=$Apache::inputtags::status['-1'];
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ) {
- if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
- $status eq 'CAN_ANSWER') {
+ if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
# if part is zero, no s existed, so we need to the grading
&Apache::inputtags::grade;
} elsif ( $target eq 'web' && $Apache::inputtags::part eq '0') {
@@ -284,6 +342,8 @@ sub end_problem {
} elsif ($target eq 'edit') {
&Apache::lonxml::debug("in end_problem with $target, edit");
$result=' ';
+ } elsif ($target eq 'tex') {
+ $result .= '\vskip 0.5mm\noindent\makebox[9.0cm][b]{\hrulefill}\end{document}';
}
return $result;
}
@@ -379,39 +439,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
+ my $result;
+ 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[$_] ]";
+ # }
+ }
+ my @idx_arr = (0 .. $#randomlist);
+ &Apache::structuretags::shuffle(\@idx_arr);
+ my $bodytext = '';
+ 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[$_] ]";
+ }
+ &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); }
}
-
- &Apache::lonxml::newparser($parser,\$bodytext);
- return "";
+ return $result;
}
sub shuffle {
@@ -428,7 +501,12 @@ sub shuffle {
}
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 {
@@ -548,17 +626,19 @@ sub end_startouttext {
$result.=&Apache::edit::start_table($token)."