--- loncom/homework/structuretags.pm 2003/08/13 17:54:12 1.203
+++ loncom/homework/structuretags.pm 2003/09/19 20:29:29 1.210
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.203 2003/08/13 17:54:12 sakharuk Exp $
+# $Id: structuretags.pm,v 1.210 2003/09/19 20:29:29 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,6 +36,7 @@ use strict;
use Apache::lonnet;
use Apache::File();
use Apache::lonmenu;
+use Apache::lonlocal;
BEGIN {
&Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext',
@@ -72,7 +73,7 @@ sub end_tex {
sub page_start {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my %found;
- foreach my $taginside ($tagstack) {
+ foreach my $taginside (@$tagstack) {
foreach my $taglookedfor ('html','body','form') {
if ($taginside =~ /^$taglookedfor$/i) {$found{$taglookedfor} = 1;}
}
@@ -130,11 +131,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;
}
@@ -152,8 +160,8 @@ sub setup_rndseed {
$ENV{'form.rndseed'}=$rndseed;
}
}
- if ($ENV{'form.resetdata'} eq 'New Problem Variation' ||
- $ENV{'form.newrandomization'} eq 'New Randomization') {
+ if ($ENV{'form.resetdata'} eq &mt('New Problem Variation') ||
+ $ENV{'form.newrandomization'} eq &mt('New Randomization')) {
srand(time);
$rndseed=int(rand(2100000000));
$ENV{'form.rndseed'}=$rndseed;
@@ -171,43 +179,44 @@ sub setup_rndseed {
sub problem_edit_header {
return '
-
-
-
-
-
-
+
+
+
+
+
+
';
}
sub problem_edit_footer {
- return '
- ';
+ return '
+ ';
}
sub problem_web_to_edit_header {
my ($rndseed)=@_;
- my $result.='
-
-
-
-
-
+ my $result.='
+
+
+
+
+
'.&mt(' Show All Foils').'
';
my $numtoanalyze=$ENV{'form.numtoanalyze'};
if (!$numtoanalyze) { $numtoanalyze=20; }
- $result.= ' for
+ $result.= ' for
versions of this problem.'.
- &Apache::loncommon::help_open_topic("Analyze_Problem",
+ $numtoanalyze.'" size="5" /> '.&mt('versions of this problem').
+ '.'.&Apache::loncommon::help_open_topic("Analyze_Problem",
'',undef,undef,300).
- '';
+ '';
return $result;
}
@@ -268,6 +277,43 @@ 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);
+#don't undef this, lonhomework.pm takes care of this, we use this to
+#detect if we try to do 2 problems in one file
+# undef($Apache::lonhomework::parsing_a_problem);
+ undef($Apache::lonhomework::name);
+}
+
sub start_problem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
@@ -279,20 +325,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;
@@ -414,12 +447,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');
@@ -443,19 +470,14 @@ sub start_problem {
my $due_file_content = $due_file_content[$#due_file_content];
chomp $due_file_content;
my $name_of_resourse= &get_resource_name($parstack,$safeeval);
- if (not $name_of_resourse=~/\S+/) {
- $name_of_resourse=$ENV{'request.uri'};
- $name_of_resourse=~/\/([^\/]+)$/;
- $name_of_resourse=$1;
- }
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/ and $Apache::lonhomework::type ne 'exam') {
- $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource
"'.$name_of_resourse.'"
located in '.$ENV{'request.uri'}.' STAMPOFPASSEDRESOURCEEND}\addcontentsline{toc}{subsection}{'.$name_of_resourse.'} \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}\addcontentsline{toc}{subsection}{'.$name_of_resourse.'} \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 {
@@ -463,7 +485,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}\addcontentsline{toc}{subsection}{'.$name_of_resourse.'} \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 \\\\\\\\';
@@ -556,10 +578,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;
}
@@ -568,7 +588,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);
@@ -602,6 +622,7 @@ sub end_library {
$ENV{'request.state'} eq "construct") {
$result.='
'.&Apache::lonxml::xmlend();
}
+ if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };
return $result;
}
@@ -914,6 +935,8 @@ sub start_part {
$Apache::lonhomework::problemstatus=
&Apache::lonnet::EXT("resource.$id.problemstatus");
my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
+ my $expression='$external::part='.$Apache::inputtags::part.';';
+ &Apache::run::run($expression,$safeeval);
if ($target eq 'meta') {
return &Apache::response::mandatory_part_meta;