--- loncom/homework/structuretags.pm 2002/08/23 21:17:16 1.105
+++ loncom/homework/structuretags.pm 2002/10/14 20:48:36 1.126
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.105 2002/08/23 21:17:16 albertel Exp $
+# $Id: structuretags.pm,v 1.126 2002/10/14 20:48:36 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -161,8 +161,14 @@ sub problem_web_to_edit_header {
Show All Foils
';
+ my $numtoanalyze=$ENV{'form.numtoanalyze'};
+ if (!$numtoanalyze) { $numtoanalyze=100; }
+ #DISABLED for now.
+ #$result.= '
+#
';
}
sub initialize_storage {
@@ -297,7 +303,9 @@ sub start_problem {
$msg.=&checkout_msg;
}
$result.=$msg.'
';
- }
+ } elsif ($target eq 'tex') {
+ $result.="\\begin{document}\\noindent \\vskip 1 mm \\begin{minipage}{\\textwidth}\\vskip 0 mm Problem is not open to be viewed. It $accessmsg \\vskip 0 mm ";
+ }
} elsif ($target eq 'web') {
my $name= &get_resource_name($parstack,$safeeval);
if ($status eq 'CAN_ANSWER') {
@@ -345,18 +353,18 @@ sub start_problem {
print $temp_file "$duedate\n";
if (not $ENV{'request.symb'} =~ m/\.page_/) {
if(not $duedate=~m/1969/) {
- $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm';
+ $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}';
} else {
- $result .= '\begin{document} \noindent \vskip 1 mm';
+ $result .= '\begin{document} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}';
}
} else {
- $result .= '\parbox{\minipagewidth}{\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
+ $result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
}
} else {
if (not $ENV{'request.symb'} =~ m/\.page_/) {
- $result .= '\begin{document} \noindent \vskip 1 mm';
+ $result .= '\begin{document} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}';
} else {
- $result .= '\parbox{\minipagewidth}{\vskip 1mm \\\\\\\\';
+ $result .= '\vskip 1mm \\\\\\\\';
}
}
}
@@ -379,27 +387,41 @@ sub end_problem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
my $status=$Apache::inputtags::status['-1'];
- if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ) {
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') {
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' || $target eq 'tex') && $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);
+ my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
+ if ($Apache::lonhomework::type ne 'exam') {$result.= $gradestatus;}
}
if (
- ($target eq 'web' && ($ENV{'request.state'} ne 'construct')) ||
- ($target eq 'answer')
+ (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
+ ($target eq 'answer') || ($target eq 'tex')
) {
if ($status eq 'CAN_ANSWER') {
- $result.=" \n";
+ if ($target ne 'tex') {
+ $result.="\n";
+ }
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||
$status eq 'UNCHECKEDOUT' ) {
- $result.="\n";
+ if ($target ne 'tex') {
+ $result.="\n";
+ }
+ }
+ if ($target ne 'tex') {
+ $result.=&Apache::lonxml::xmlend();
+ } else {
+ $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
+ if (not $ENV{'request.symb'} =~ m/\.page_/) {
+ $result .= '\end{minipage}\end{document} ';
+ } else {
+ $result .= '';
+ }
}
- $result.=&Apache::lonxml::xmlend();
}
if ($target eq 'grade') {
&Apache::lonhomework::showhash(%Apache::lonhomework::results);
@@ -412,22 +434,18 @@ sub end_problem {
} elsif ($target eq 'edit') {
&Apache::lonxml::debug("in end_problem with $target, edit");
$result = &problem_edit_footer();
- } elsif ($target eq 'tex') {
- $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;
}
+
sub start_library {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
- &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+ my ($result,$head_tag_start,$body_tag_start,$form_tag_start);
+
if ($target eq 'edit') {
+ ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
+ &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
$result.=$head_tag_start."".$body_tag_start.$form_tag_start.
&problem_edit_header();
my $temp=&Apache::edit::insertlist($target,$token);
@@ -435,7 +453,10 @@ sub start_library {
} elsif ($target eq 'modified') {
$result=$token->[4];
$result.=&Apache::edit::handle_insert();
- } elsif ($target eq 'web' && $ENV{'request.state'} eq "construct" ) {
+ } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
+ $ENV{'request.state'} eq "construct" ) {
+ ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
+ &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
my $name=&get_resource_name($parstack,$safeeval);
my $rndseed=&setup_rndseed($safeeval);
$result.="$head_tag_start