--- loncom/homework/structuretags.pm 2002/11/22 19:46:36 1.138
+++ loncom/homework/structuretags.pm 2003/03/07 23:41:29 1.155
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.138 2002/11/22 19:46:36 albertel Exp $
+# $Id: structuretags.pm,v 1.155 2003/03/07 23:41:29 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,6 +35,7 @@ package Apache::structuretags;
use strict;
use Apache::lonnet;
use Apache::File();
+use Apache::lonmenu;
BEGIN {
&Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
@@ -43,7 +44,7 @@ BEGIN {
sub start_web {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]);
+ my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
if ($target eq 'web') {
return $bodytext;
}
@@ -56,7 +57,7 @@ sub end_web {
sub start_tex {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);
+ my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
if ($target eq 'tex') {
return $bodytext.' ';
}
@@ -81,12 +82,12 @@ sub page_start {
if (!defined($found{'html'})) {
$result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,
$parser,$safeeval);
- $head_tag_start='
'.&Apache::lonxml::registerurl(undef,$target);
+ $head_tag_start=''.&Apache::lonmenu::registerurl(undef,$target);
}
my $body_tag_start;
if (!defined($found{'body'})) {
- $body_tag_start='';
+ $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
my ($symb)=&Apache::lonxml::whichuser();
if ($symb eq '') {
@@ -118,11 +119,10 @@ sub page_start {
return ($result,$head_tag_start,$body_tag_start,$form_tag_start);
}
-use Time::HiRes();
+#use Time::HiRes();
sub get_resource_name {
my ($parstack,$safeeval)=@_;
my $name=&Apache::lonnet::gettitle();
- &Apache::lonnet::logthis("Got $name");
if ($name eq '') {
$name=&Apache::lonnet::EXT('resource.title');
if ($name eq 'con_lost') { $name = ''; }
@@ -241,18 +241,20 @@ ENDCHECKOUT
sub start_problem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ $Apache::lonhomework::parsing_a_problem=1;
# 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]);
+ my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
return '';
}
#intialize globals
$Apache::inputtags::part='0';
@Apache::inputtags::responselist = ();
@Apache::inputtags::previous=();
+ $Apache::structuretags::printanswer='No';
if ($target ne 'analyze') {
&initialize_storage();
if ($target eq 'web') {
@@ -305,12 +307,17 @@ sub start_problem {
&Apache::lonxml::debug("Got $status");
if (( $status eq 'CLOSED' ) ||
( $status eq 'UNCHECKEDOUT') ||
- ( $status eq 'BANNED')) {
+ ( $status eq 'BANNED') ||
+ ( $status eq 'UNAVAILABLE')) {
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
if ( $target eq "web" ) {
$result.= $head_tag_start.'';
- my $msg=$body_tag_start.
- 'Not open to be viewed
';
+ my $msg=$body_tag_start;
+ if ($status eq 'UNAVAILABLE') {
+ $result.='Unable to determine if this resource is open due to network problems. Please try again later.
';
+ } else {
+ $result.='Not open to be viewed
';
+ }
if ($status eq 'CLOSED') {
$msg.='The problem '.$accessmsg;
} elsif ($status eq 'UNCHECKEDOUT') {
@@ -318,8 +325,13 @@ sub start_problem {
}
$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 ";
- }
+ $result.='\begin{document}\noindent \vskip 1 mm \begin{minipage}{\textwidth}\vskip 0 mm';
+ if ($status eq 'UNAVAILABLE') {
+ $result.='Unable to determine if this resource is open due to network problems. Please try again later.\vskip 0 mm ';
+ } else {
+ $result.="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') {
@@ -338,7 +350,7 @@ sub start_problem {
}
}
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER'
- || $status eq 'CLOSED') {
+ || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE') {
$result.=$head_tag_start.
"$name\n$body_tag_start\n";
}
@@ -350,6 +362,15 @@ sub start_problem {
}
$Apache::lonhomework::name=$name;
my $id = $Apache::inputtags::part;
+ my $weight = &Apache::lonnet::EXT("resource.$id.weight");
+ my $allkeys = &Apache::lonnet::metadata($ENV{'request.uri'},'keys');
+ my @allkeys = split /,/,$allkeys;
+ my $allow_print_points = 0;
+ foreach my $partial_key (@allkeys) {
+ if ($partial_key=~m/weight/) {
+ $allow_print_points++;
+ }
+ }
my $duedate = &Apache::lonnet::EXT("resource.$id.duedate");
$duedate = POSIX::strftime("%c",localtime($duedate));
my $temp_file;
@@ -362,21 +383,24 @@ sub start_problem {
my @due_file_content = <$temp_file>;
my $due_file_content = $due_file_content[$#due_file_content];
chomp $due_file_content;
+ my $name_of_resourse= &get_resource_name($parstack,$safeeval);
if ($due_file_content ne $duedate) {
$temp_file = Apache::File->new('>'.$filename);
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\noindent \begin{minipage}{\textwidth}';
+ if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}';
} else {
- $result .= '\begin{document} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}';
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}';
+ if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
}
} else {
$result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
}
} else {
if (not $ENV{'request.symb'} =~ m/\.page_/) {
- $result .= '\begin{document} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}';
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}';
+ if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
} else {
$result .= '\vskip 1mm \\\\\\\\';
}
@@ -402,7 +426,7 @@ sub end_problem {
my $result='';
my $status=$Apache::inputtags::status['-1'];
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') {
- if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
+ if ( $target eq 'grade' && $Apache::inputtags::part eq '0' && $status eq 'CAN_ANSWER' ) {
# if part is zero, no s existed, so we need to the grading
&Apache::inputtags::grade;
} elsif ( ($target eq 'web' || $target eq 'tex') && $Apache::inputtags::part eq '0' &&
@@ -426,21 +450,25 @@ sub end_problem {
$result.="\n";
}
}
- if ($target ne 'tex') {
+ if ($target eq 'web') {
$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 .= '';
- }
+ } 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{minipage}\end{document} ';
+ } else {
+ $result .= '';
+ }
}
}
if ($target eq 'grade') {
&Apache::lonhomework::showhash(%Apache::lonhomework::results);
&finalize_storage();
}
+ if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct') ) {
+ $result.='