--- loncom/homework/structuretags.pm 2002/01/30 17:37:21 1.79
+++ loncom/homework/structuretags.pm 2002/08/07 17:24:35 1.103
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.79 2002/01/30 17:37:21 albertel Exp $
+# $Id: structuretags.pm,v 1.103 2002/08/07 17:24:35 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,6 +33,7 @@ package Apache::structuretags;
use strict;
use Apache::lonnet;
+use Apache::File();
BEGIN {
&Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
@@ -56,7 +57,7 @@ sub start_tex {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);
if ($target eq 'tex') {
- return $bodytext
+ return $bodytext.' ';
}
return '';
}
@@ -79,11 +80,11 @@ sub page_start {
if (!defined($found{'html'})) {
$result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,
$parser,$safeeval);
- $head_tag_start='
'.&Apache::lonxml::registerurl();
+ $head_tag_start=''.&Apache::lonxml::registerurl(undef,$target);
}
my $body_tag_start;
if (!defined($found{'body'})) {
- my $body_tag_start='
Checking out resources is subject to course policies, and may exclude future
credit even if done erroneously.
-
-
ENDCHECKOUT
}
@@ -162,7 +162,10 @@ ENDCHECKOUT
sub start_problem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- if ( $Apache::inputtags::part ne '' ) {
+ # 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 '';
@@ -171,12 +174,14 @@ sub start_problem {
$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+)$/) {
@@ -197,9 +202,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"};
@@ -262,6 +267,9 @@ sub start_problem {
$rndseed.'" />
+ Show All Foils
';
}
# if we are viewing someone else preserve that info
@@ -276,6 +284,42 @@ sub start_problem {
$result.=$head_tag_start.
"$name\n$body_tag_start\n";
}
+ } elsif ($target eq 'tex') {
+ my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ if ($name eq '') {
+ $name=&Apache::lonnet::EXT('resource.title');
+ if ($name eq 'con_lost') { $name = ''; }
+ }
+ $Apache::lonhomework::name=$name;
+ my $id = $Apache::inputtags::part;
+ my $duedate = &Apache::lonnet::EXT("resource.$id.duedate");
+ $duedate = POSIX::strftime("%c",localtime($duedate));
+ my $temp_file;
+ my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due";
+ if (-e $filename) {
+ $temp_file = Apache::File->new($filename);
+ } else {
+ $temp_file = Apache::File->new('>>'.$filename);
+ }
+ my @due_file_content = <$temp_file>;
+ my $due_file_content = $due_file_content[$#due_file_content];
+ chomp $due_file_content;
+ if ($due_file_content ne $duedate) {
+ $temp_file = Apache::File->new('>'.$filename);
+ print $temp_file "$duedate\n";
+ if($duedate eq 'Wed 31 Dec 1969 07:00:00 PM EDT') {$duedate = '';}
+ if (not $ENV{'request.symb'} =~ m/\.page_/) {
+ $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm';
+ } else {
+ $result .= '\parbox{\minipagewidth}{\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
+ }
+ } else {
+ if (not $ENV{'request.symb'} =~ m/\.page_/) {
+ $result .= '\begin{document} \noindent \vskip 1 mm';
+ } else {
+ $result .= '\parbox{\minipagewidth}{\vskip 1mm \\\\\\\\';
+ }
+ }
}
} elsif ($target eq 'edit') {
$result.=$head_tag_start."".$body_tag_start.
@@ -283,18 +327,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 = '';
@@ -307,11 +350,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);
@@ -322,7 +365,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();
@@ -337,9 +381,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[\textwidth/$number_of_columns][b]{\hrulefill}';
+ if (not $ENV{'request.symb'} =~ m/\.page_/) {
+ $result .= '\end{document} ';
+ } else {
+ $result .= '} ';
+ }
}
return $result;
}
@@ -435,6 +485,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);
@@ -459,16 +510,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 {
@@ -485,11 +547,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;
@@ -497,7 +565,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.'";';
@@ -506,11 +574,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 {
@@ -605,17 +679,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 {
|