--- loncom/homework/structuretags.pm 2002/10/01 21:04:34 1.121
+++ loncom/homework/structuretags.pm 2002/11/25 21:19:45 1.139
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.121 2002/10/01 21:04:34 sakharuk Exp $
+# $Id: structuretags.pm,v 1.139 2002/11/25 21:19:45 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,6 +29,7 @@
# 6/26/2001 fixed extra web display at end of tags
# 8/17,8/18,8/20 Gerd Kortemeyer
+
package Apache::structuretags;
use strict;
@@ -100,6 +101,14 @@ sub page_start {
}
}
$body_tag_start.='>';
+ if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
+ my ($symb)=&Apache::lonxml::whichuser();
+ if ($symb eq '') {
+ my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
+ $help="Browsing or ambiguous reference, submissions ignored $help
";
+ $body_tag_start.=$help;
+ }
+ }
}
my $form_tag_start;
if (!defined($found{'form'})) {
@@ -109,10 +118,12 @@ sub page_start {
return ($result,$head_tag_start,$body_tag_start,$form_tag_start);
}
+use Time::HiRes();
sub get_resource_name {
my ($parstack,$safeeval)=@_;
- my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);
- if ($name eq '') {
+ 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 = ''; }
}
@@ -129,6 +140,7 @@ sub setup_rndseed {
$rndseed=time;
$ENV{'form.rndseed'}=$rndseed;
}
+ &Apache::lonxml::debug("Setting rndseed to $rndseed");
&Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
}
return $rndseed;
@@ -140,13 +152,13 @@ sub problem_edit_header {
-
-
+
+
';
}
@@ -163,6 +175,12 @@ sub problem_web_to_edit_header {
if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }
$result.= ' /> Show All Foils
';
+ my $numtoanalyze=$ENV{'form.numtoanalyze'};
+ if (!$numtoanalyze) { $numtoanalyze=100; }
+ $result.= '
+
';
+ return $result;
}
sub initialize_storage {
@@ -265,6 +283,7 @@ sub start_problem {
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';}
+ if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
#handle exam checkout
if ($Apache::lonhomework::type eq 'exam') {
@@ -283,10 +302,11 @@ sub start_problem {
my $expression='$external::datestatus="'.$status.'";';
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
&Apache::run::run($expression,$safeeval);
+ &Apache::lonxml::debug("Got $status");
if (( $status eq 'CLOSED' ) ||
( $status eq 'UNCHECKEDOUT') ||
( $status eq 'BANNED')) {
- my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
+ my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
if ( $target eq "web" ) {
$result.= $head_tag_start.'';
my $msg=$body_tag_start.
@@ -389,9 +409,7 @@ sub end_problem {
$status ne 'UNCHECKEDOUT') {
# if part is zero, no s existed, so we need show the current
# grading status
- my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part);
- #FIXME this is ugly we should just generate tex in inputtags
- if ($target eq 'tex') { $gradestatus=&html_to_tex($gradestatus); }
+ my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
if ($Apache::lonhomework::type ne 'exam') {$result.= $gradestatus;}
}
if (
@@ -476,21 +494,40 @@ sub end_library {
}
sub start_block {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
- my $code = @$parstack[$#$parstack];
- $code =~ s/\"//g;
- $code .=';return $condition;';
- # print "
$code
";
- my $result = &Apache::run::run($code,$safeeval);
- &Apache::lonxml::debug("block :$code: returned :$result:");
- if ( ! $result ) {
- my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);
- &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]");
+ my $result;
+
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+ $target eq 'tex' || $target eq 'analyze') {
+ my $code = @$parstack[$#$parstack];
+ if ($code) {
+ $code =~ s/\"//g;
+ $code .=';return $condition;';
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
+ $result = &Apache::run::run($code,$safeeval);
+ &Apache::lonxml::debug("block :$code: returned :$result:");
+ } else {
+ $result='1';
+ }
+ if ( ! $result ) {
+ my $skip=&Apache::lonxml::get_all_text("/block",$$parser[-1]);
+ &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('Test Condition:','condition',
+ $token,40);
+ $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'condition');
+ if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
- }
- return "";
+ return $result;
}
sub end_block {
@@ -505,6 +542,9 @@ sub start_while {
$code .=';return $condition;';
push( @Apache::structuretags::whileconds, $code);
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
my $result = &Apache::run::run($code,$safeeval);
my $bodytext=$$parser[$#$parser]->get_text("/while");
push( @Apache::structuretags::whilebody, $bodytext);
@@ -535,7 +575,7 @@ sub start_randomlist {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' ||
- $target eq 'tex') {
+ $target eq 'tex' || $target eq 'analyze') {
my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);
my $b_parser= HTML::TokeParser->new(\$body);
my $b_tok;
@@ -625,13 +665,28 @@ sub start_part {
if ( $target eq "web" ) {
$result="
Part is not open to be viewed. It $accessmsg
";
} elsif ( $target eq 'tex' ) {
- $result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\";
+ $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}";
}
} else {
if ($target eq 'tex') {
- $result='\vskip 0 mm';
+ if ($$tagstack[-2] ne 'problem') {
+ $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+ }
}
}
+ } elsif ($target eq 'edit') {
+ $result.=&Apache::edit::tag_start($target,$token);
+ $result.=&Apache::edit::text_arg('Part ID:','id',$token).
+ &Apache::loncommon::help_open_topic("Part_Tag_Edit_Help").
+ &Apache::edit::end_row().&Apache::edit::start_spanning_row();
+
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+ 'id');
+ if ($constructtag) {
+ $result = &Apache::edit::rebuild_tag($token);
+ $result.=&Apache::edit::handle_insert();
+ }
}
return $result;
}
@@ -640,24 +695,27 @@ sub end_part {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
&Apache::lonxml::debug("in end_part $target ");
my $status=$Apache::inputtags::status['-1'];
- pop @Apache::inputtags::status;
- if ( $target eq 'meta' ) { return ''; }
- if ( $target eq 'grade' && $status eq 'CAN_ANSWER') {
- return &Apache::inputtags::grade;
- }
- if ($target eq 'web' || $target eq 'tex' ) {
- my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
+ my $result='';
+ if ( $target eq 'meta' ) {
+ $result='';
+ } elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER') {
+ $result=&Apache::inputtags::grade;
+ } elsif ($target eq 'web' || $target eq 'tex' ) {
+ my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
+ $target);
if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}
- return $gradestatus;
+ $result=$gradestatus;
}
- return '';
+ pop @Apache::inputtags::status;
+ return $result;
}
sub start_preduedate {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
- $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {
+ $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' &&
+ $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
&Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);
}
}
@@ -751,7 +809,9 @@ sub start_endouttext {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
if ($target eq "edit" ) { $result="".&Apache::edit::end_table()."\n"; }
- if ($target eq "modified") { $result=''; }
+ if ($target eq "modified") {
+ $result=''.
+ &Apache::edit::handle_insertafter('startouttext'); }
return $result;
}
sub end_endouttext {