--- loncom/homework/structuretags.pm 2003/10/15 22:24:06 1.200.2.4
+++ loncom/homework/structuretags.pm 2003/08/30 02:33:25 1.207
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.200.2.4 2003/10/15 22:24:06 albertel Exp $
+# $Id: structuretags.pm,v 1.207 2003/08/30 02:33:25 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -130,11 +130,18 @@ sub page_start {
#use Time::HiRes();
sub get_resource_name {
my ($parstack,$safeeval)=@_;
+ if (defined($Apache::lonhomework::name)) {
+ return $Apache::lonhomework::name;
+ }
my $name=&Apache::lonnet::gettitle();
if ($name eq '') {
$name=&Apache::lonnet::EXT('resource.title');
if ($name eq 'con_lost') { $name = ''; }
}
+ if ($name!~/\S+/) {
+ $name=$ENV{'request.uri'};
+ $name=~s-.*/([^/]+)$-$1-;
+ }
$Apache::lonhomework::name=$name;
return $name;
}
@@ -268,6 +275,41 @@ credit even if done erroneously.
ENDCHECKOUT
}
+sub init_problem_globals {
+ my ($type)=@_;
+ #initialize globals
+ if ($type eq 'problem') {
+ $Apache::inputtags::part='0';
+ @Apache::inputtags::partlist=('0');
+ $Apache::lonhomework::problemstatus=
+ &Apache::lonnet::EXT('resource.0.problemstatus');
+ } else {
+ $Apache::inputtags::part='';
+ @Apache::inputtags::partlist=();
+ $Apache::lonhomework::problemstatus='';
+ }
+ @Apache::inputtags::responselist = ();
+ @Apache::inputtags::importlist = ();
+ @Apache::inputtags::previous=();
+ @Apache::inputtags::previous_version=();
+ $Apache::structuretags::printanswer='No';
+ @Apache::structuretags::whileconds=();
+ @Apache::structuretags::whilebody=();
+ @Apache::structuretags::whileline=();
+ $Apache::lonhomework::scantronmode=0;
+ undef($Apache::lonhomework::name);
+
+}
+
+sub reset_problem_globals {
+ my ($type)=@_;
+ undef(%Apache::lonhomework::history);
+ undef(%Apache::lonhomework::results);
+ undef($Apache::inputtags::part);
+ undef($Apache::lonhomework::parsing_a_problem);
+ undef($Apache::lonhomework::name);
+}
+
sub start_problem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
@@ -279,20 +321,7 @@ sub start_problem {
}
$Apache::lonhomework::parsing_a_problem=1;
-#initialize globals
- $Apache::inputtags::part='0';
- @Apache::inputtags::partlist=('0');
- @Apache::inputtags::responselist = ();
- @Apache::inputtags::importlist = ();
- @Apache::inputtags::previous=();
- @Apache::inputtags::previous_version=();
- $Apache::structuretags::printanswer='No';
- @Apache::structuretags::whileconds=();
- @Apache::structuretags::whilebody=();
- @Apache::structuretags::whileline=();
- $Apache::lonhomework::scantronmode=0;
- $Apache::lonhomework::problemstatus=
- &Apache::lonnet::EXT('resource.0.problemstatus');
+ &init_problem_globals('problem');
if (defined($ENV{'scantron.maxquest'})) {
$Apache::lonhomework::scantronmode=1;
@@ -363,8 +392,7 @@ sub start_problem {
if (( $status eq 'CLOSED' ) ||
( $status eq 'UNCHECKEDOUT') ||
( $status eq 'BANNED') ||
- ( $status eq 'UNAVAILABLE') ||
- ( $status eq 'INVALID_ACCESS')) {
+ ( $status eq 'UNAVAILABLE')) {
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
if ( $target eq "web" ) {
$result.= $head_tag_start.'';
@@ -374,7 +402,7 @@ sub start_problem {
} else {
$result.='Not open to be viewed
';
}
- if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
+ if ($status eq 'CLOSED') {
$msg.='The problem '.$accessmsg;
} elsif ($status eq 'UNCHECKEDOUT') {
$msg.=&checkout_msg;
@@ -406,8 +434,7 @@ sub start_problem {
}
}
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER'
- || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE' ||
- $status eq 'INVALID_ACCESS') {
+ || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE') {
$result.=$head_tag_start.
"$name\n$body_tag_start\n";
}
@@ -416,12 +443,6 @@ sub start_problem {
if (not $ENV{'form.problem_split'}=~/yes/) {
$startminipage = '\begin{minipage}{\textwidth}';
}
- 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 $weight = &Apache::lonnet::EXT("resource.$id.weight");
my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'keys');
@@ -450,9 +471,9 @@ sub start_problem {
print $temp_file "$duedate\n";
if (not $ENV{'request.symb'} =~ m/\.page_/) {
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 '.$startminipage;
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
} else {
- $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage;
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
}
} else {
@@ -460,7 +481,7 @@ sub start_problem {
}
} else {
if (not $ENV{'request.symb'} =~ m/\.page_/) {
- $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage;
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
} else {
$result .= '\vskip 1mm \\\\\\\\';
@@ -510,7 +531,7 @@ sub end_problem {
$result.=" \n";
}
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||
- $status eq 'UNCHECKEDOUT' || $status eq 'INVALID_ACCESS') {
+ $status eq 'UNCHECKEDOUT' ) {
if ($target ne 'tex' &&
$ENV{'form.answer_output_mode'} ne 'tex') {
$result.="\n";
@@ -553,10 +574,8 @@ sub end_problem {
if ($ENV{'request.state'} eq 'construct' && $target eq 'web') {
&Apache::inputtags::check_for_duplicate_ids();
}
- undef(%Apache::lonhomework::history);
- undef(%Apache::lonhomework::results);
- undef($Apache::inputtags::part);
- undef($Apache::lonhomework::parsing_a_problem);
+
+ &reset_problem_globals('problem');
return $result;
}
@@ -565,7 +584,7 @@ sub end_problem {
sub start_library {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my ($result,$head_tag_start,$body_tag_start,$form_tag_start);
-
+ if ($$tagstack[0] eq 'library') { &init_problem_globals('library') };
if ($target eq 'edit') {
($result,$head_tag_start,$body_tag_start,$form_tag_start)=
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
@@ -599,6 +618,7 @@ sub end_library {
$ENV{'request.state'} eq "construct") {
$result.=''.&Apache::lonxml::xmlend();
}
+ if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };
return $result;
}
@@ -627,14 +647,14 @@ sub end_definetag {
}
sub start_block {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
my $code = $token->[2]->{'condition'};
- if ($code) {
+ if (defined($code)) {
if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);
}
@@ -644,7 +664,7 @@ sub start_block {
$result='1';
}
if ( ! $result ) {
- my $skip=&Apache::lonxml::get_all_text("/block",$parser);
+ my $skip=&Apache::lonxml::get_all_text("/block",$parser,$style);
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
}
$result='';
@@ -671,13 +691,33 @@ sub end_block {
}
sub start_languageblock {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
- &Apache::lonxml::startredirection();
+ my $include = $token->[2]->{'include'};
+ my $exclude = $token->[2]->{'exclude'};
+ my %languages=&Apache::loncommon::display_languages();
+ $result='1';
+ if ($include) {
+ $result='';
+ foreach (split(/\,/,$include)) {
+ if ($languages{$_}) { $result='1'; }
+ }
+ }
+ if ($exclude) {
+ foreach (split(/\,/,$exclude)) {
+ if ($languages{$_}) { $result='0'; }
+ }
+ }
+ if ( ! $result ) {
+ my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser,
+ $style);
+ &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
+ }
+ $result='';
} elsif ($target eq 'edit') {
$result .=&Apache::edit::tag_start($target,$token);
$result .=&Apache::edit::text_arg('Include Language:','include',
@@ -697,38 +737,14 @@ sub start_languageblock {
sub end_languageblock {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
-
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
- $target eq 'tex' || $target eq 'analyze') {
- my $text=&Apache::lonxml::endredirection();
- my $include= &Apache::lonxml::get_param('include',$parstack,$safeeval);
- my $exclude= &Apache::lonxml::get_param('exclude',$parstack,$safeeval);
- my %languages=&Apache::loncommon::display_languages();
- $result='1';
- if ($include) {
- $result='';
- foreach (split(/\,/,$include)) {
- if ($languages{$_}) { $result='1'; }
- }
- }
- if ($exclude) {
- foreach (split(/\,/,$exclude)) {
- if ($languages{$_}) { $result='0'; }
- }
- }
- if ( ! $result ) {
- $result='';
- } else {
- $result=$text;
- }
- } elsif ($target eq "edit") {
+ if ($target eq "edit") {
$result.= &Apache::edit::tag_end($target,$token,'');
}
return $result;
}
sub start_instructorcomment {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
@@ -736,7 +752,8 @@ sub start_instructorcomment {
$target eq 'tex' || $target eq 'analyze') {
$result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/);
if ( ! $result ) {
- my $skip=&Apache::lonxml::get_all_text("/instructorcomment",$parser);
+ my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
+ $parser,$style);
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
}
$result='';
@@ -927,11 +944,7 @@ sub start_part {
my $expression='$external::datestatus="'.$status.'";';
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
&Apache::run::run($expression,$safeeval);
- if (( $status eq 'CLOSED' ) ||
- ( $status eq 'UNCHECKEDOUT') ||
- ( $status eq 'BANNED') ||
- ( $status eq 'UNAVAILABLE') ||
- ( $status eq 'INVALID_ACCESS')) {
+ if ( $status eq 'CLOSED' ) {
my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
if ( $target eq "web" ) {
$result="