--- loncom/homework/structuretags.pm 2003/05/15 21:44:23 1.175
+++ loncom/homework/structuretags.pm 2003/06/18 22:12:34 1.186
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.175 2003/05/15 21:44:23 albertel Exp $
+# $Id: structuretags.pm,v 1.186 2003/06/18 22:12:34 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -43,9 +43,9 @@ BEGIN {
sub start_web {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
- if ($target eq 'web') {
- return $bodytext;
+ if (!($target eq 'web' || $target eq 'edit' || $target eq 'modified' ||
+ $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
+ my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
}
return '';
}
@@ -56,9 +56,10 @@ sub end_web {
sub start_tex {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
- if ($target eq 'tex') {
- return $bodytext.' ';
+ if (!($target eq 'tex' || $target eq 'edit' || $target eq 'modified' ||
+ $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
+ &Apache::lonxml::debug("tex 1");
+ my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
}
return '';
}
@@ -154,6 +155,8 @@ sub setup_rndseed {
$rndseed=int(rand(1000000000));
}
$ENV{'form.rndseed'}=$rndseed;
+ delete($ENV{'form.resetdata'});
+ delete($ENV{'form.newrandomization'});
}
&Apache::lonxml::debug("Setting rndseed to $rndseed");
&Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
@@ -193,10 +196,13 @@ sub problem_web_to_edit_header {
$result.= ' /> Show All Foils
';
my $numtoanalyze=$ENV{'form.numtoanalyze'};
- if (!$numtoanalyze) { $numtoanalyze=100; }
- $result.= '
+ if (!$numtoanalyze) { $numtoanalyze=20; }
+ $result.= ' for
';
+ $numtoanalyze.'" size="5" /> versions of this problem.'.
+ &Apache::loncommon::help_open_topic("Analyze_Problem",
+ '',undef,undef,300).
+ '';
return $result;
}
@@ -260,18 +266,19 @@ 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);
+ if ( $Apache::inputtags::part ne '' ||
+ $Apache::lonhomework::parsing_a_problem) {
+ &Apache::lonxml::error('Only one <problem> allowed in a .problem file');
+ #my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
return '';
}
+
+ $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';
@@ -340,7 +347,7 @@ sub start_problem {
''.
'';
+ value="'.$ENV{'form.username'}.'" /> ';
}
($status,$accessmsg) = &Apache::lonhomework::check_access('0');
push (@Apache::inputtags::status,$status);
@@ -398,6 +405,10 @@ sub start_problem {
"$name\n$body_tag_start\n";
}
} elsif ($target eq 'tex') {
+ my $startminipage = '';
+ if ($ENV{'form.problem_split'} ne 'yes') {
+ $startminipage = '\begin{minipage}{\textwidth}';
+ }
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
if ($name eq '') {
$name=&Apache::lonnet::EXT('resource.title');
@@ -432,9 +443,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 \begin{minipage}{\textwidth}';
+ $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;
} else {
- $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource
"'.$name_of_resourse.'"
located in '.$ENV{'request.uri'}.' STAMPOFPASSEDRESOURCEEND} \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'.$startminipage;
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
}
} else {
@@ -442,7 +453,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\begin{minipage}{\textwidth}';
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource
"'.$name_of_resourse.'"
located in '.$ENV{'request.uri'}.' STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage;
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
} else {
$result .= '\vskip 1mm \\\\\\\\';
@@ -500,9 +511,13 @@ sub end_problem {
if ($target eq 'web') {
$result.=&Apache::lonxml::xmlend();
} elsif ($target eq 'tex') {
+ my $endminipage = '';
+ if ($ENV{'form.problem_split'} ne 'yes') {
+ $endminipage = '\end{minipage}';
+ }
$result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
if (not $ENV{'request.symb'} =~ m/\.page_/) {
- $result .= '\end{minipage}\end{document} ';
+ $result .= $endminipage.'\end{document} ';
} else {
$result .= '';
}
@@ -519,6 +534,7 @@ sub end_problem {
}
} elsif ($target eq 'meta') {
if ($Apache::inputtags::part eq '0') {
+ @Apache::inputtags::response=();
$result=&Apache::response::mandatory_part_meta;
}
} elsif ($target eq 'edit') {
@@ -526,6 +542,9 @@ sub end_problem {
$result = &problem_edit_footer();
}
+ 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);
@@ -626,26 +645,7 @@ sub start_languageblock {
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
- 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);
- &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
- }
- $result='';
+ &Apache::lonxml::startredirection();
} elsif ($target eq 'edit') {
$result .=&Apache::edit::tag_start($target,$token);
$result .=&Apache::edit::text_arg('Include Language:','include',
@@ -665,7 +665,31 @@ sub start_languageblock {
sub end_languageblock {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
- if ($target eq "edit") {
+
+ 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") {
$result.= &Apache::edit::tag_end($target,$token,'');
}
return $result;
@@ -851,7 +875,8 @@ sub start_part {
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
if ($id eq '') { $id = $Apache::lonxml::curdepth; }
$Apache::inputtags::part=$id;
- @Apache::inputtags::responselist = ();
+ push(@Apache::inputtags::partlist,$id);
+ @Apache::inputtags::response=();
@Apache::inputtags::previous=();
@Apache::inputtags::previous_version=();
$Apache::lonhomework::problemstatus=
@@ -916,6 +941,8 @@ sub end_part {
$target);
if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}
$result=$gradestatus;
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
}
pop @Apache::inputtags::status;
$Apache::inputtags::part='';