--- loncom/homework/lonhomework.pm	2005/01/31 21:57:32	1.196
+++ loncom/homework/lonhomework.pm	2005/11/15 21:39:33	1.225
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.196 2005/01/31 21:57:32 albertel Exp $
+# $Id: lonhomework.pm,v 1.225 2005/11/15 21:39:33 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,7 +30,7 @@ package Apache::lonhomework;
 use strict;
 use Apache::style();
 use Apache::lonxml();
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::lonplot();
 use Apache::inputtags();
 use Apache::structuretags();
@@ -72,59 +72,62 @@ BEGIN {
 #                       contruct   - is a /priv/ resource
 #      form.grade_target - a form parameter requesting a specific target
 sub get_target {
-    &Apache::lonxml::debug("request.state = $ENV{'request.state'}");
-    if( defined($ENV{'form.grade_target'})) {
-	&Apache::lonxml::debug("form.grade_target= $ENV{'form.grade_target'}");
+    &Apache::lonxml::debug("request.state = $env{'request.state'}");
+    if( defined($env{'form.grade_target'})) {
+	&Apache::lonxml::debug("form.grade_target= $env{'form.grade_target'}");
     } else {
 	&Apache::lonxml::debug("form.grade_target <undefined>");
     }
-    if (($ENV{'request.state'} eq "published") ||
-	($ENV{'request.state'} eq "uploaded")) {
-	if ( defined($ENV{'form.grade_target'}  ) 
-	     && ($ENV{'form.grade_target'} eq 'tex')) {
-	    return ($ENV{'form.grade_target'});
-	} elsif ( defined($ENV{'form.grade_target'}  ) 
+    if (($env{'request.state'} eq "published") ||
+	($env{'request.state'} eq "uploaded")) {
+	if ( defined($env{'form.grade_target'}  ) 
+	     && ($env{'form.grade_target'} eq 'tex')) {
+	    return ($env{'form.grade_target'});
+	} elsif ( defined($env{'form.grade_target'}  ) 
 		  && ($Apache::lonhomework::viewgrades eq 'F' )) {
-	    return ($ENV{'form.grade_target'});
+	    return ($env{'form.grade_target'});
 	}
-
-	if ( defined($ENV{'form.submitted'}) &&
-	     ( !defined($ENV{'form.resetdata'})) &&
-	     ( !defined($ENV{'form.newrandomization'}))) {
+	if ($env{'form.webgrade'} &&
+	    $Apache::lonhomework::modifygrades eq 'F') {
+	    return ('grade','webgrade');
+	}
+	if ( defined($env{'form.submitted'}) &&
+	     ( !defined($env{'form.resetdata'})) &&
+	     ( !defined($env{'form.newrandomization'}))) {
 	    return ('grade', 'web');
 	} else {
 	    return ('web');
 	}
-    } elsif ($ENV{'request.state'} eq "construct") {
-	if ( defined($ENV{'form.grade_target'}) ) {
-	    return ($ENV{'form.grade_target'});
+    } elsif ($env{'request.state'} eq "construct") {
+	if ( defined($env{'form.grade_target'}) ) {
+	    return ($env{'form.grade_target'});
 	}
-	if ( defined($ENV{'form.preview'})) {
-	    if ( defined($ENV{'form.submitted'})) {
+	if ( defined($env{'form.preview'})) {
+	    if ( defined($env{'form.submitted'})) {
 		return ('grade', 'web');
 	    } else {
 		return ('web');
 	    }
 	} else {
-	    if ( $ENV{'form.problemmode'} eq &mt('View') ||
-		 $ENV{'form.problemmode'} eq &mt('Discard Edits and View')) {
-		if ( defined($ENV{'form.submitted'}) &&
-		     (!defined($ENV{'form.resetdata'})) &&
-		     (!defined($ENV{'form.newrandomization'}))) {
+	    if ( $env{'form.problemmode'} eq &mt('View') ||
+		 $env{'form.problemmode'} eq &mt('Discard Edits and View')) {
+		if ( defined($env{'form.submitted'}) &&
+		     (!defined($env{'form.resetdata'})) &&
+		     (!defined($env{'form.newrandomization'}))) {
 		    return ('grade', 'web','answer');
 		} else {
 		    return ('web','answer');
 		}
-	    } elsif ( $ENV{'form.problemmode'} eq &mt('Edit') ||
-		      $ENV{'form.problemmode'} eq 'Edit') {
-		if ( $ENV{'form.submitted'} eq 'edit' ) {
-		    if ( $ENV{'form.submit'} eq &mt('Submit Changes and View') ) {
+	    } elsif ( $env{'form.problemmode'} eq &mt('Edit') ||
+		      $env{'form.problemmode'} eq 'Edit') {
+		if ( $env{'form.submitted'} eq 'edit' ) {
+		    if ( $env{'form.submit'} eq &mt('Submit Changes and View') ) {
 			return ('modified','web','answer');
 		    } else {
-			return ('modified','edit');
+			return ('modified','no_output_web','edit');
 		    }
 		} else {
-		    return ('edit');
+		    return ('no_output_web','edit');
 		}
 	    } else {
 		return ('web');
@@ -143,7 +146,7 @@ sub setup_vars {
 sub send_header {
     my ($request)= @_;
     $request->print(&Apache::lontexconvert::header());
-#  $request->print('<form name='.$ENV{'form.request.prefix'}.'lonhomework method="POST" action="'.$request->uri.'">');
+#  $request->print('<form name='.$env{'form.request.prefix'}.'lonhomework method="POST" action="'.$request->uri.'">');
 }
 
 sub createmenu {
@@ -162,11 +165,28 @@ sub send_footer {
     $request->print(&Apache::lontexconvert::footer());
 }
 
-$Apache::lonxml::browse='';
+sub proctor_checked_in {
+    my ($slot_name,$slot)=@_;
+    my @allowed=split(",",$slot->{'proctor'});
+    my $version=$Apache::lonhomework::history{'resource.version'};
+    foreach my $possible (@allowed) { 
+	if ($Apache::lonhomework::history{"resource.$version.checkedin"} eq
+	    $possible &&
+	    $Apache::lonhomework::history{"resource.$version.checkedin.slot"}
+	       eq $slot_name) {
+	    return 1;
+	}
+    }
+    return 0;
+}
 
+$Apache::lonxml::browse='';
 sub check_ip_acc {
     my ($acc)=@_;
-    if (!defined($acc) || $acc =~ /^\s*$/) { return 1; }
+    &Apache::lonxml::debug("acc is $acc");
+    if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) { 
+	return 1;
+    }
     my $allowed=0;
     my $ip=$ENV{'REMOTE_ADDR'};
     my $name;
@@ -209,6 +229,70 @@ sub check_ip_acc {
     }
     return $allowed;
 }
+
+sub check_task_access {
+    # does it pass normal muster
+    # yes we really do want the default args passing
+    my ($status,$datemsg)=&check_access;
+    if ($status eq 'SHOW_ANSWER' ||
+	$status eq 'CLOSED' ||
+	$status eq 'INVALID_ACCESS' ||
+	$status eq 'UNAVAILABLE') {
+	return ($status,$datemsg);
+    }
+    if ($env{'request.state'} eq "construct") {
+	return ($status,$datemsg);
+    }
+    my $version=$Apache::lonhomework::history{'resource.version'};
+    if ($Apache::lonhomework::history{"resource.$version.checkedin"} &&
+	$Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
+	return ('SHOW_ANSWER');
+    }
+    my ($id)=@_;
+    my @slots=
+	(split(':',&Apache::lonnet::EXT("resource.$id.availablestudent")),
+	 split(':',&Apache::lonnet::EXT("resource.$id.available")));
+
+#    if (!@slots) {
+#	return ($status,$datemsg);
+#    }
+    my $slotstatus='NOT_IN_A_SLOT';
+    my ($returned_slot,$slot_name);
+    foreach my $slot (@slots) {
+	&Apache::lonxml::debug("getting $slot");
+	my %slot=&Apache::lonnet::get_slot($slot);
+	&Apache::lonhomework::showhash(%slot);
+	if ($slot{'starttime'} < time &&
+	    $slot{'endtime'} > time &&
+	    &check_ip_acc($slot{'ip'})) {
+	    &Apache::lonxml::debug("$slot is good");
+	    $slotstatus='NEEDS_CHECKIN';
+	    $returned_slot=\%slot;
+	    $slot_name=$slot;
+	    last;
+	}
+    }
+    if ($slotstatus eq 'NEEDS_CHECKIN' &&
+	&proctor_checked_in($slot_name,$returned_slot)) {
+	&Apache::lonxml::debug("protoctor checked in");
+	$slotstatus='CAN_ANSWER';
+    }
+    if ( $slotstatus eq 'NOT_IN_A_SLOT' && 
+	$Apache::lonhomework::history{"resource.$version.checkedin"}) {
+	if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
+	    return ('SHOW_ANSWER');
+	} else {
+	    return ('WAITING_FOR_GRADE');
+	}
+    }
+    if ( $status eq 'CANNOT_ANSWER' && 
+	 ($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) {
+	return ($status,$datemsg);
+    }
+
+    return ($slotstatus,$datemsg,$slot_name,$returned_slot);
+}
+
 # JB, 9/24/2002: Any changes in this function may require a change
 # in lonnavmaps::resource::getDateStatus.
 sub check_access {
@@ -221,16 +305,16 @@ sub check_access {
     my $type;
     my $passed;
 
-    if ($ENV{'request.state'} eq "construct") {
-	if ($ENV{'form.problemstate'}) {
-	    if ($ENV{'form.problemstate'} =~ /^CANNOT_ANSWER/) {
-		if ( ! ($ENV{'form.problemstate'} eq 'CANNOT_ANSWER_correct' &&
+    if ($env{'request.state'} eq "construct") {
+	if ($env{'form.problemstate'}) {
+	    if ($env{'form.problemstate'} =~ /^CANNOT_ANSWER/) {
+		if ( ! ($env{'form.problemstate'} eq 'CANNOT_ANSWER_correct' &&
 			lc($Apache::lonhomework::problemstatus) eq 'no')) {
 		    return ('CANNOT_ANSWER',
 			    &mt('is in this state due to author settings.'));
 		}
 	    } else {
-		return ($ENV{'form.problemstate'},
+		return ($env{'form.problemstate'},
 			&mt('is in this state due to author settings.'));
 	    }
 	}
@@ -243,7 +327,10 @@ sub check_access {
     &Apache::lonxml::debug("checking for part :$id:");
     &Apache::lonxml::debug("time:".time);
 
-    if ($ENV{'request.state'} ne "construct") {
+    my ($symb)=&Apache::lonxml::whichuser();
+    &Apache::lonxml::debug("symb:".$symb);
+    #if ($env{'request.state'} ne "construct" && $symb ne '') {
+    if ($env{'request.state'} ne "construct") {
 	my $allowed=&check_ip_acc(&Apache::lonnet::EXT("resource.$id.acc"));
 	if (!$allowed && ($Apache::lonhomework::browse ne 'F')) {
 	    $status='INVALID_ACCESS';
@@ -295,13 +382,14 @@ sub check_access {
 	    $datemsg = &mt("was due on")." $lastdate".&mt(", and answers will be available on")." $date";
 	}
     }
-    if ($status eq 'CAN_ANSWER') {
+    if ($status eq 'CAN_ANSWER' ||
+	(($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED'))) {
 	#check #tries, and if correct.
 	my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
 	my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
 	if ( $tries eq '' ) { $tries = '0'; }
 	if ( $maxtries eq '' && 
-	     $ENV{'request.state'} ne 'construct') { $maxtries = '2'; } 
+	     $env{'request.state'} ne 'construct') { $maxtries = '2'; } 
 	if ($maxtries && $tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
 	# if (correct and show prob status) or excused then CANNOT_ANSWER
 	if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
@@ -411,31 +499,36 @@ sub showhashsubset {
 }
 
 sub setuppermissions {
-    $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
-    my $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+    $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$env{'request.filename'});
+    my $viewgrades = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
     if (! $viewgrades && 
-	exists($ENV{'request.course.sec'}) && 
-	$ENV{'request.course.sec'} !~ /^\s*$/) {
-	$viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}.
-                                               '/'.$ENV{'request.course.sec'});
+	exists($env{'request.course.sec'}) && 
+	$env{'request.course.sec'} !~ /^\s*$/) {
+	$viewgrades = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}.
+                                               '/'.$env{'request.course.sec'});
     }
     $Apache::lonhomework::viewgrades = $viewgrades; # File global variable...dirt.
     if ($Apache::lonhomework::browse eq 'F' && 
-	$ENV{'form.devalidatecourseresdata'} eq 'on') {
+	$env{'form.devalidatecourseresdata'} eq 'on') {
 	my (undef,$courseid) = &Apache::lonxml::whichuser();
-	&Apache::lonnet::devalidatecourseresdata($ENV{"course.$courseid.num"},
-					      $ENV{"course.$courseid.domain"});
+	&Apache::lonnet::devalidatecourseresdata($env{"course.$courseid.num"},
+					      $env{"course.$courseid.domain"});
     }
-    return ''
+    my $modifygrades = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
+    if (! $modifygrades && 
+	exists($env{'request.course.sec'}) && 
+	$env{'request.course.sec'} !~ /^\s*$/) {
+	$modifygrades = 
+	    &Apache::lonnet::allowed('mgr',$env{'request.course.id'}.
+				     '/'.$env{'request.course.sec'});
+    }
+    $Apache::lonhomework::modifygrades = $modifygrades;
+    return '';
 }
 
 sub setupheader {
     my $request=$_[0];
-    if ($ENV{'browser.mathml'}) {
-	&Apache::loncommon::content_type($request,'text/xml');
-    } else {
-	&Apache::loncommon::content_type($request,'text/html');
-    }
+    &Apache::loncommon::content_type($request,'text/html');
     if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {
 	&Apache::loncommon::no_cache($request);
     }
@@ -455,7 +548,7 @@ sub handle_save_or_undo {
 
     &Apache::lonnet::correct_line_ends($result);
 
-    if ($ENV{'form.Undo'} eq &mt('undo')) {
+    if ($env{'form.Undo'} eq &mt('undo')) {
 	my $error=0;
 	if (!copy($file,$filetmp)) { $error=1; }
 	if ((!$error) && (!copy($filebak,$file))) { $error=1; }
@@ -492,15 +585,14 @@ sub handle_save_or_undo {
 
 sub analyze_header {
     my ($request) = @_;
-    my $bodytag='<body bgcolor="#ffffff">';
-    if ($ENV{'environment.remote'} eq 'off') {
-	$bodytag=&Apache::loncommon::bodytag();
-    }
-    my $result.='<html>
+    my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,
+					    ($env{'environment.remote'} ne 'off'));
+    my $html=&Apache::lonxml::xmlbegin();
+    my $result.=$html.'
             <head><title>'.&mt("Analyzing a problem").'</title></head>
             '.$bodytag.&Apache::lonxml::message_location().'
             <form name="lonhomework" method="POST" action="'.
-	    &HTML::Entities::encode($ENV{'request.uri'},'<>&"').'">'.
+	    &HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
 	    &Apache::structuretags::remember_problem_state().'
             <input type="submit" name="problemmode" value="'.&mt("EditXML").'" />
             <input type="submit" name="problemmode" value="'.&mt('Edit').'" />
@@ -525,21 +617,23 @@ sub analyze {
     &Apache::lonxml::debug("Analyze");
     my $result;
     my %overall;
+    my %seedexample;
     my %allparts;
-    my $rndseed=$ENV{'form.rndseed'};
+    my $rndseed=$env{'form.rndseed'};
     &analyze_header($request);
     my %prog_state=
 	&Apache::lonhtmlcommon::Create_PrgWin($request,&mt('Analyze Progress'),
 					      &mt('Getting Problem Variants'),
-					      $ENV{'form.numtoanalyze'},
+					      $env{'form.numtoanalyze'},
 					      'inline',undef);
-    for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) {
+    for(my $i=1;$i<$env{'form.numtoanalyze'}+1;$i++) {
 	&Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state,
 						 &mt('last problem'));
 	if (&Apache::loncommon::connection_aborted($request)) { return; }
+        my $thisseed=$i+$rndseed;
 	my $subresult=&Apache::lonnet::ssi($request->uri,
 					   ('grade_target' => 'analyze'),
-					   ('rndseed' => $i+$rndseed));
+					   ('rndseed' => $thisseed));
 	(my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2);
 	my %analyze=&Apache::lonnet::str2hash($subresult);
 	my @parts;
@@ -551,8 +645,13 @@ sub analyze {
 	    if ($analyze{$part.'.type'} eq 'numericalresponse'	||
 		$analyze{$part.'.type'} eq 'stringresponse'	||
 		$analyze{$part.'.type'} eq 'formularesponse'   ) {
+		my $concatanswer=join("\0",@{ $analyze{$part.'.answer'} });
+		if (($concatanswer eq '') || ($concatanswer=~/^\@/)) {
+		    @{$analyze{$part.'.answer'}}=('<font color="red">'.&mt('Error').'</font>');
+		}
 		push( @{ $overall{$part.'.answer'} },
 		      [@{ $analyze{$part.'.answer'} }]);
+                $seedexample{join("\0",@{ $analyze{$part.'.answer'}})}=$thisseed;
 	    }
 	}
     }
@@ -562,17 +661,18 @@ sub analyze {
     foreach my $part (sort(keys(%allparts))) {
 	if (defined(@{ $overall{$part.'.answer'} })) {
 	    my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] });
-	    $request->print('<table><tr><th colspan="'.($num_cols+1).'">'.&mt('Part').' '.$part.'</th></tr>');
+	    $request->print('<table class="thinborder"><tr><th colspan="'.($num_cols+1).'">'.&mt('Part').' '.$part.'</th></tr>');
 	    my %frequency;
 	    foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {
 		$frequency{join("\0",@{ $answer })}++;
 	    }
-	    $request->print('<tr><th colspan="'.($num_cols).'">'.&mt('Answer').'</th><th>'.&mt('Frequency').'</th></tr>');
+	    $request->print('<tr><th colspan="'.($num_cols).'">'.&mt('Answer').'</th><th>'.&mt('Frequency').'<br />('
+			    .&mt('click for example').')</th></tr>');
 	    foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) {
-		$request->print('<tr><td align="right">'.
-				join('</td><td align="right">',split("\0",$answer)).
-				'</td><td>('.$frequency{$answer}.
-				')</td></tr>');
+		$request->print('<tr><td class="center">'.
+				join('</td><td class="center">',split("\0",$answer)).
+				'</td><td class="center"><a href="'.$request->uri.'?rndseed='.$seedexample{$answer}.'">'.$frequency{$answer}.
+				'</a></td></tr>');
 	    }
 	    $request->print('</table>');
 	} else {
@@ -581,7 +681,7 @@ sub analyze {
 	}
     }
     if (scalar(keys(%allparts)) == 0 ) {
-	$request->print('<p>'.&mt('Found no analyzable respones in this problem, currently only Numerical, Formula and String response styles are supported.').'</p>');
+	$request->print('<p>'.&mt('Found no analyzable responses in this problem, currently only Numerical, Formula and String response styles are supported.').'</p>');
     }
     &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state);
     &analyze_footer($request);
@@ -598,15 +698,15 @@ sub editxmlmode {
 			       " <i>$file</i></b>");
 	$problem='';
     }
-    if (defined($ENV{'form.editxmltext'}) || defined($ENV{'form.Undo'})) {
+    if (defined($env{'form.editxmltext'}) || defined($env{'form.Undo'})) {
 	my $error=&handle_save_or_undo($request,\$problem,
-				       \$ENV{'form.editxmltext'});
+				       \$env{'form.editxmltext'});
 	if (!$error) { $problem=&Apache::lonnet::getfile($file); }
     }
-    &Apache::lonhomework::showhashsubset(\%ENV,'^form');
-    if ( $ENV{'form.submit'} eq &mt('Submit Changes and View') ) {
-	&Apache::lonhomework::showhashsubset(\%ENV,'^form');
-	$ENV{'form.problemmode'}='View';
+    &Apache::lonhomework::showhashsubset(\%env,'^form');
+    if ( $env{'form.submit'} eq &mt('Submit Changes and View') ) {
+	&Apache::lonhomework::showhashsubset(\%env,'^form');
+	$env{'form.problemmode'}='View';
 	&renderpage($request,$file);
     } else {
 	my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
@@ -619,13 +719,14 @@ sub editxmlmode {
 	if ($cols > 80) { $cols = 80; }
 	if ($cols < 70) { $cols = 70; }
 	if ($rows < 20) { $rows = 20; }
-	my $bodytag='<body bgcolor="#ffffff">';
-	if ($ENV{'environment.remote'} eq 'off') {
-	    $bodytag=&Apache::loncommon::bodytag();
-	}
-	$result.='<html>'.$bodytag.&Apache::lonxml::message_location().'
+	my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,
+					($env{'environment.remote'} ne 'off'));
+	my $html=&Apache::lonxml::xmlbegin();
+	$result.=$html.$bodytag.
+	    &renderpage($request,$file,['no_output_web'],1).
+	    &Apache::lonxml::message_location().'
             <form name="lonhomework" method="POST" action="'.
-	    &HTML::Entities::encode($ENV{'request.uri'},'<>&"').'">'.
+	    &HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
 	    &Apache::structuretags::remember_problem_state().'
             <input type="hidden" name="problemmode" value="'.&mt('EditXML').'" />
             <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
@@ -636,7 +737,7 @@ sub editxmlmode {
             <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
             <hr />
             ' . $xml_help . '
-            <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
+            <textarea style="width:100%" rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
 	    &HTML::Entities::encode($problem,'<>&"').'</textarea>
             </form></body></html>';
 	&Apache::lonxml::add_messages(\$result);
@@ -649,10 +750,10 @@ sub editxmlmode {
 #    Render the page in whatever target desired.
 #
 sub renderpage {
-    my ($request,$file) = @_;
+    my ($request,$file,$targets,$return_string) = @_;
 
-    my (@targets) = &get_target();
-    &Apache::lonhomework::showhashsubset(\%ENV,'form.');
+    my @targets = @{$targets || [&get_target()]};
+    &Apache::lonhomework::showhashsubset(\%env,'form.');
     &Apache::lonxml::debug("Running targets ".join(':',@targets));
     my $overall_result;
     foreach my $target (@targets) {
@@ -664,22 +765,28 @@ sub renderpage {
 	#    $request->print(" You most likely shouldn't see me.");
 	#}
 	#my $t0 = [&gettimeofday()];
+	my $output=1;
+	if ($target eq 'no_output_web') {
+	    $target = 'web'; $output=0;
+	}
 	my $problem=&Apache::lonnet::getfile($file);
+	my $result;
 	if ($problem eq -1) {
-	    &Apache::lonxml::error("<b> ".&mt('Unable to find')." <i>$file</i></b>");
+	    my $filename=(split('/',$file))[-1];
+	    $result.="<b> ".&mt('Unable to find')." <i>$filename</i></b>";
 	    $problem='';
 	}
 
 	my %mystyle;
-	my $result = '';
 	if ($target eq 'analyze') { %Apache::lonhomework::analyze=(); }
 	if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }
-	if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');}
+	if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%env,'^form');}
 
 	&Apache::lonxml::debug("Should be parsing now");
-	$result = &Apache::lonxml::xmlparse($request, $target, $problem,
-					    &setup_vars($target),%mystyle);
+	$result .= &Apache::lonxml::xmlparse($request, $target, $problem,
+					     &setup_vars($target),%mystyle);
 	undef($Apache::lonhomework::parsing_a_problem);
+	if (!$output) { $result = ''; }
 	#$request->print("Result follows:");
 	if ($target eq 'modified') {
 	    &handle_save_or_undo($request,\$problem,\$result);
@@ -700,9 +807,13 @@ sub renderpage {
 	#$request->print(":Result ends");
 	#my $td=&tv_interval($t0);
     }
-    &Apache::lonxml::add_messages(\$overall_result);
-    $request->print($overall_result);   
-    $request->rflush();   
+    if (!$return_string) {
+	&Apache::lonxml::add_messages(\$overall_result);
+	$request->print($overall_result);   
+	$request->rflush();   
+    } else {
+	return $overall_result;
+    }
 }
 
 # with no arg it returns a HTML <option> list of the template titles
@@ -734,14 +845,14 @@ sub newproblem {
     $extension=~s:^.*\.([\w]+)$:$1:;
     &Apache::lonxml::debug("Looking for :$extension:");
     my $templatelist=&get_template_list('',$extension);
-    if ($ENV{'form.template'} &&
-	$ENV{'form.template'} ne "Select a $extension template") {
+    if ($env{'form.template'} &&
+	$env{'form.template'} ne "Select a $extension template") {
 	use File::Copy;
-	my $file = &get_template_list($ENV{'form.template'},$extension);
+	my $file = &get_template_list($env{'form.template'},$extension);
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
 	copy($file,$dest);
 	&renderpage($request,$dest);
-    } elsif($ENV{'form.newfile'} && !$templatelist) {
+    } elsif($env{'form.newfile'} && !$templatelist) {
 	# I don't like hard-coded filenames but for now, this will work.
 	use File::Copy;
 	my $templatefilename =
@@ -756,12 +867,12 @@ sub newproblem {
 	$shownurl=~s-^/~-/priv/-;
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
 	my $errormsg;
-	if ($ENV{'form.newfile'}) {
+	if ($env{'form.newfile'}) {
 	    $errormsg='<p><font color="red">'.&mt('You did not select a template.').'</font></p>'."\n";
 	}
 	my $instructions;
 	my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,
-					($ENV{'environment.remote'} ne 'off'));
+					($env{'environment.remote'} ne 'off'));
 	if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'<br />'.&mt("Then");}
 	my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new',
 			  'resource' => 'resource',
@@ -812,60 +923,56 @@ EDITMENU
 sub handler {
     #my $t0 = [&gettimeofday()];
     my $request=$_[0];
-    
-    $Apache::lonxml::debug=$ENV{'user.debug'};
-    $ENV{'request.uri'}=$request->uri;
+    $Apache::lonxml::request=$request;
+    $Apache::lonxml::debug=$env{'user.debug'};
+    $env{'request.uri'}=$request->uri;
     &setuppermissions();
     # some times multiple problemmodes are submitted, need to select
     # the last one
-    if ( defined($ENV{'form.problemmode'}) && ref($ENV{'form.problemmode'}) ) {
-	my $mode=$ENV{'form.problemmode'}->[-1];
-	undef $ENV{'form.problemmode'};
-	$ENV{'form.problemmode'}=$mode;
+    if ( defined($env{'form.problemmode'}) && ref($env{'form.problemmode'}) ) {
+	my $mode=$env{'form.problemmode'}->[-1];
+	undef $env{'form.problemmode'};
+	$env{'form.problemmode'}=$mode;
     }
 
     my $file=&Apache::lonnet::filelocation("",$request->uri);
 
     #check if we know where we are
-    if ($ENV{'request.course.fn'} && !&Apache::lonnet::symbread()) { 
+    if ($env{'request.course.fn'} && !&Apache::lonnet::symbread()) { 
 	# if we are browsing we might not be able to know where we are
 	if ($Apache::lonhomework::browse ne 'F' && 
-	    $ENV{'request.state'} ne "construct") {
+	    $env{'request.state'} ne "construct") {
 	    #should know where we are, so ask
-	    if ( &Apache::lonnet::mod_perl_version() == 2 ) {
-		&Apache::lonnet::cleanenv();
-	    }
-	    &Apache::lonnet::logthis(&Apache::lonnet::mod_perl_version());
 	    $request->internal_redirect('/adm/ambiguous'); return OK;
 	}
     }
     if (&setupheader($request)) { return OK; }
     &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
-    &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});
+    &Apache::lonxml::debug("Problem Mode ".$env{'form.problemmode'});
     my ($symb) = &Apache::lonxml::whichuser();
     &Apache::lonxml::debug('symb is '.$symb);
-    if ($ENV{'request.state'} eq "construct" || $symb eq '') {
-	if ($ENV{'form.resetdata'} eq &mt('Reset Submissions') ||
-	    $ENV{'form.resetdata'} eq &mt('New Problem Variation') ||
-	    $ENV{'form.newrandomization'} eq &mt('New Randomization')) {
+    if ($env{'request.state'} eq "construct" || $symb eq '') {
+	if ($env{'form.resetdata'} eq &mt('Reset Submissions') ||
+	    $env{'form.resetdata'} eq &mt('New Problem Variation') ||
+	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
 	    my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
 	    &Apache::lonnet::tmpreset($symb,'',$domain,$name);
 	    &Apache::lonxml::debug("Attempt reset");
 	}
     }
-    if ($ENV{'request.state'} eq "construct") {
+    if ($env{'request.state'} eq "construct") {
 	if ( -e $file ) {
 	    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 						    ['problemmode']);
-	    if (!(defined $ENV{'form.problemmode'})) {
+	    if (!(defined $env{'form.problemmode'})) {
 		#first visit to problem in construction space
 		#&view_or_edit_menu($request);
-		$ENV{'form.problemmode'}='View';
+		$env{'form.problemmode'}='View';
 		&renderpage($request,$file);
-	    } elsif ($ENV{'form.problemmode'} eq &mt('EditXML') ||
-		     $ENV{'form.problemmode'} eq 'EditXML') {
+	    } elsif ($env{'form.problemmode'} eq &mt('EditXML') ||
+		     $env{'form.problemmode'} eq 'EditXML') {
 		&editxmlmode($request,$file);
-	    } elsif ($ENV{'form.problemmode'} eq &mt('Calculate answers')) {
+	    } elsif ($env{'form.problemmode'} eq &mt('Calculate answers')) {
 		&analyze($request,$file);
 	    } else {
 		&renderpage($request,$file);