--- loncom/homework/lonhomework.pm	2005/05/10 20:58:38	1.208
+++ loncom/homework/lonhomework.pm	2005/07/12 21:50:05	1.212
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.208 2005/05/10 20:58:38 albertel Exp $
+# $Id: lonhomework.pm,v 1.212 2005/07/12 21:50:05 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -124,10 +124,10 @@ sub get_target {
 		    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');
@@ -242,20 +242,21 @@ sub check_task_access {
 	return ($status,$datemsg);
     }
     my $version=$Apache::lonhomework::history{'resource.version'};
-    if ($Apache::lonhomework::history{"resource.$version.checkedin"}) {
-	if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||
-	    $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
-	    return ('SHOW_ANSWER');
-	}
+    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.available"));
+    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 (sort(@slots)) {
+    foreach my $slot (@slots) {
 	&Apache::lonxml::debug("getting $slot");
 	my %slot=&Apache::lonnet::get_slot($slot);
 	&Apache::lonhomework::showhash(%slot);
@@ -274,9 +275,13 @@ sub check_task_access {
 	&Apache::lonxml::debug("protoctor checked in");
 	$slotstatus='CAN_ANSWER';
     }
-    if ( ($slotstatus eq 'NOT_IN_A_SLOT' || $slotstatus eq 'NEEDS_CHECKIN') && 
+    if ( $slotstatus eq 'NOT_IN_A_SLOT' && 
 	$Apache::lonhomework::history{"resource.$version.checkedin"}) {
-	return ('WAITING_FOR_GRADE');
+	if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
+	    return ('SHOW_ANSWER');
+	} else {
+	    return ('WAITING_FOR_GRADE');
+	}
     }
     return ($slotstatus,$datemsg,$slot_name,$returned_slot);
 }
@@ -315,6 +320,9 @@ sub check_access {
     &Apache::lonxml::debug("checking for part :$id:");
     &Apache::lonxml::debug("time:".time);
 
+    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')) {
@@ -367,7 +375,8 @@ 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");
@@ -728,9 +737,9 @@ sub editxmlmode {
 #    Render the page in whatever target desired.
 #
 sub renderpage {
-    my ($request,$file) = @_;
+    my ($request,$file,$targets) = @_;
 
-    my (@targets) = &get_target();
+    my @targets = @{$targets || [&get_target()]};
     &Apache::lonhomework::showhashsubset(\%env,'form.');
     &Apache::lonxml::debug("Running targets ".join(':',@targets));
     my $overall_result;
@@ -743,6 +752,10 @@ 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);
 	if ($problem eq -1) {
 	    &Apache::lonxml::error("<b> ".&mt('Unable to find')." <i>$file</i></b>");
@@ -750,15 +763,15 @@ sub renderpage {
 	}
 
 	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');}
 
 	&Apache::lonxml::debug("Should be parsing now");
-	$result = &Apache::lonxml::xmlparse($request, $target, $problem,
-					    &setup_vars($target),%mystyle);
+	my $result = &Apache::lonxml::xmlparse($request, $target, $problem,
+					       &setup_vars($target),%mystyle);
 	undef($Apache::lonhomework::parsing_a_problem);
+	if (!$output) { $result = &Apache::lonxml::message_location(); }
 	#$request->print("Result follows:");
 	if ($target eq 'modified') {
 	    &handle_save_or_undo($request,\$problem,\$result);
@@ -943,6 +956,7 @@ sub handler {
 		&renderpage($request,$file);
 	    } elsif ($env{'form.problemmode'} eq &mt('EditXML') ||
 		     $env{'form.problemmode'} eq 'EditXML') {
+		&renderpage($request,$file,['no_output_web']);
 		&editxmlmode($request,$file);
 	    } elsif ($env{'form.problemmode'} eq &mt('Calculate answers')) {
 		&analyze($request,$file);