--- loncom/homework/structuretags.pm 2002/01/23 14:36:19 1.77
+++ loncom/homework/structuretags.pm 2002/06/27 18:47:23 1.100
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.77 2002/01/23 14:36:19 sakharuk Exp $
+# $Id: structuretags.pm,v 1.100 2002/06/27 18:47:23 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,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'))
}
@@ -67,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);
}
@@ -135,11 +150,10 @@ permanent record is left in the system.<
Checking out resources is subject to course policies, and may exclude future
credit even if done erroneously.
-
-
ENDCHECKOUT
}
@@ -147,16 +161,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();
- if ($target eq 'web') {
- &Apache::lonhomework::showhash(%Apache::lonhomework::history);
+ 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:");
}
- $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+)$/) {
@@ -177,9 +201,9 @@ sub start_problem {
#should get back a or the neccesary stuff to start XML/MathML
my ($result,$head_tag_start,$body_tag_start)=
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+ if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';}
-
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
#handle exam checkout
if ($Apache::lonhomework::type eq 'exam') {
my $token=$Apache::lonhomework::history{"resource.0.outtoken"};
@@ -242,6 +266,9 @@ sub start_problem {
$rndseed.'" />
+ Show All Foils
';
}
# if we are viewing someone else preserve that info
@@ -256,6 +283,15 @@ sub start_problem {
$result.=$head_tag_start.
"$name\n$body_tag_start\n";
}
+ } elsif ($target eq 'tex') {
+ my $id = $Apache::inputtags::part;
+ my $duedate = &Apache::lonnet::EXT("resource.$id.duedate");
+ $duedate = POSIX::strftime("%c",localtime($duedate));
+ if (not $ENV{'request.symb'} =~ m/\.page_/) {
+ $result .= '\begin{document} \noindent\fbox{Due date: '.$duedate.'} \vskip 1 mm';
+ } else {
+ $result .= '\parbox{\minipagewidth}{\vskip 1mm\fbox{Due date: '.$duedate.'} \\\\\\\\';
+ }
}
} elsif ($target eq 'edit') {
$result.=$head_tag_start."".$body_tag_start.
@@ -263,18 +299,17 @@ sub start_problem {
$ENV{'request.uri'}.'">
-
+
-
+
+
';
my $temp=&Apache::edit::insertlist($target,$token);
$result.=$temp;
} 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 = '';
@@ -287,11 +322,11 @@ 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') {
+ } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0' &&
+ $status ne 'UNCHECKEDOUT') {
# if part is zero, no s existed, so we need show the current
# grading status
$result.= &Apache::inputtags::gradestatus($Apache::inputtags::part);
@@ -302,7 +337,8 @@ sub end_problem {
) {
if ($status eq 'CAN_ANSWER') {
$result.="\n";
- } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
+ } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||
+ $status eq 'UNCHECKEDOUT' ) {
$result.="\n";
}
$result.=&Apache::lonxml::xmlend();
@@ -317,9 +353,15 @@ sub end_problem {
}
} elsif ($target eq 'edit') {
&Apache::lonxml::debug("in end_problem with $target, edit");
- $result='
';
+ $result ='
';
+ $result.='';
} elsif ($target eq 'tex') {
- $result .= '\end{document}';
+ $result .= '\vskip 0.5mm\noindent\makebox[9.0cm][b]{\hrulefill}';
+ if (not $ENV{'request.symb'} =~ m/\.page_/) {
+ $result .= '\end{document} ';
+ } else {
+ $result .= '} ';
+ }
}
return $result;
}
@@ -415,6 +457,7 @@ sub end_while {
#
sub start_randomlist {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ 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);
@@ -439,16 +482,27 @@ sub start_randomlist {
# print "END-TAG $b_tok->[1]
";
# }
}
-
my @idx_arr = (0 .. $#randomlist);
&Apache::structuretags::shuffle(\@idx_arr);
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[$_] ]";
}
&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 {
@@ -465,11 +519,17 @@ 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 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result='';
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
if ($id eq '') { $id = $Apache::lonxml::curdepth; }
$Apache::inputtags::part=$id;
@@ -477,7 +537,7 @@ sub start_part {
@Apache::inputtags::previous=();
if ($target eq 'meta') {
return &Apache::response::mandatory_part_meta;
- } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+ } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);
push (@Apache::inputtags::status,$status);
my $expression='$external::datestatus="'.$status.'";';
@@ -486,11 +546,17 @@ sub start_part {
if ( $status eq 'CLOSED' ) {
my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]);
if ( $target eq "web" ) {
- return "
Part is not open to be viewed. It $accessmsg
";
+ $result="
Part is not open to be viewed. It $accessmsg
";
+ } elsif ( $target eq 'tex' ) {
+ $result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\";
+ }
+ } else {
+ if ($target eq 'tex') {
+ $result='\vskip 0 mm';
}
}
}
- return '';
+ return $result;
}
sub end_part {
@@ -585,17 +651,19 @@ sub end_startouttext {
$result.=&Apache::edit::start_table($token)."Text Block |
Delete:".
&Apache::edit::deletelist($target,$token)
- ." |
+ ."
".
&Apache::edit::insertlist($target,$token).
- " |
-
\n".
- &Apache::edit::editfield($token->[1],$text,"",50,4);
+ &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n".
+ &Apache::edit::editfield($token->[1],$text,"",50,4);
}
if ($target eq 'modified') {
$text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
$result=''.&Apache::edit::modifiedfield();
}
+ if ($target eq 'tex') {
+ $result .= '\noindent ';
+ }
return $result;
}
sub start_endouttext {
|