--- loncom/homework/structuretags.pm 2007/02/24 01:44:14 1.374
+++ loncom/homework/structuretags.pm 2007/05/28 22:51:29 1.378
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.374 2007/02/24 01:44:14 albertel Exp $
+# $Id: structuretags.pm,v 1.378 2007/05/28 22:51:29 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -344,6 +344,20 @@ Feedback Mode:
'.'.&Apache::loncommon::help_open_topic("Analyze_Problem",
'',undef,undef,300).
'
';
+ } elsif ($Apache::lonhomework::parsing_a_task) {
+ $result.="
+
+Problem Status:
+
+
+
+
";
}
return $result;
}
@@ -739,7 +753,8 @@ sub start_problem {
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
$style);
if ($target eq 'web') {
- $result .= &Apache::bridgetask::proctor_validation_screen();
+ $result .=
+ &Apache::bridgetask::proctor_validation_screen($slot);
} elsif ($target eq 'grade') {
&Apache::bridgetask::proctor_check_auth($slot_name,$slot,
'problem');
@@ -777,7 +792,6 @@ sub start_problem {
$result.=$temp;
} elsif ($target eq 'modified') {
$result=$token->[4];
- $result.=&Apache::edit::handle_insert();
} else {
# page_start returned a starting result, delete it if we don't need it
$result = '';
@@ -954,7 +968,6 @@ sub end_problem {
$result .= &problem_edit_footer();
} elsif ($target eq 'modified') {
$result .= $token->[2];
- $result.=&Apache::edit::handle_insertafter($token->[1]);
}
if ($env{'request.state'} eq 'construct' && $target eq 'web') {
@@ -983,7 +996,6 @@ sub start_library {
$result.=$temp;
} elsif ($target eq 'modified') {
$result=$token->[4];
- $result.=&Apache::edit::handle_insert();
} elsif (($target eq 'web' || $target eq 'webgrade')
&& ($#$tagstack eq 0 && $$tagstack[0] eq 'library')
&& $env{'request.state'} eq "construct" ) {
@@ -1214,7 +1226,7 @@ sub end_while {
while ($return) {
if (time-$starttime >
$Apache::lonnet::perlvar{'lonScriptTimeout'}) {
- #$return = 0; $error=1; next;
+ $return = 0; $error=1; next;
}
$result.=&Apache::scripttag::xmlparse($bodytext);
$return = &Apache::run::run($code,$safeeval);
@@ -1430,7 +1442,6 @@ sub start_part {
#limiting ids to only letters numbers, and space
$token->[2]->{'id'}=~s/[^A-Za-z0-9 ]//gs;
$result = &Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::handle_insert();
}
}
return $result;
@@ -1468,7 +1479,6 @@ sub end_part {
$result.=&Apache::edit::end_table();
} elsif ($target eq 'modified') {
$result .= $token->[2];
- $result.=&Apache::edit::handle_insertafter($token->[1]);
}
pop @Apache::inputtags::status;
$Apache::inputtags::part='';
@@ -1637,7 +1647,8 @@ sub start_endouttext {
if ($target eq "edit" ) { $result="".&Apache::edit::end_table()."\n"; }
if ($target eq "modified") {
$result=''.
- &Apache::edit::handle_insertafter('startouttext'); }
+ &Apache::edit::handle_insertafter('startouttext');
+ }
return $result;
}