--- loncom/homework/lonhomework.pm	2001/01/06 15:32:22	1.25
+++ loncom/homework/lonhomework.pm	2001/01/24 14:26:28	1.35
@@ -12,24 +12,27 @@ use Apache::inputtags;
 use Apache::structuretags;
 use Apache::response;
 use Apache::hint;
-use Apache::Constants(:common);
+use Apache::outputtags;
+use Apache::Constants qw(:common);
 
 sub get_target {
   if ( $ENV{'request.state'} eq "published") {
-    if ( defined $ENV{'form.submit'}) {
+    if ( defined $ENV{'form.submitted'}) {
       return ('grade', 'web');
     } else {
       return ('web');
     }
   } elsif ($ENV{'request.state'} eq "construct") {
     if ( defined $ENV{'form.preview'}) {
-      if ( defined $ENV{'form.submit'}) {
+      if ( defined $ENV{'form.submitted'}) {
 	return ('grade', 'web');
       } else {
 	return ('web');
       }
     } else {
-      return ('edit');
+      #return ('edit');
+      #edit is currently broken
+      return ('web');
     }
   }
   return ();
@@ -72,6 +75,8 @@ sub check_date {
     &Apache::lonxml::debug("found :$date: for :$temp:");
     if ($date eq '') {
       $date = "an unknown date"; $passed = 0;
+    } elsif ($date eq 'con_lost') {
+      $date = "an indeterminate date"; $passed = 0;
     } else {
       if (time < $date) { $passed = 0; } else { $passed = 1; }
       $date = localtime $date;
@@ -90,7 +95,15 @@ sub check_date {
     $datemsg = "is due at $date";
   } elsif ($type eq 'answerdate') {
     $status='CLOSED';
-    $datemsg = "was due as $lastdate, and answers will be available at $date";
+    $datemsg = "was due on $lastdate, and answers will be available on $date";
+  }
+  if ($status eq 'CAN_ANSWER') {
+    #check #tries
+    my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
+    my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
+    if ( $tries eq '' ) { $tries = '0'; }
+    if ( $maxtries eq '' ) { $maxtries = '2'; } 
+    if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } 
   }
   &Apache::lonxml::debug("sending back :$status:$datemsg:");
   if ($ENV{'request.state'} eq "construct") {
@@ -104,7 +117,7 @@ sub check_date {
 sub handler {
   my $request=$_[0];
 
-  if ( $ENV{'user.name'} eq 'albertel' ) { $Apache::lonxml::debug=1; }
+  if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} else {$Apache::lonxml::debug=0;}
   
   my (@targets) = &get_target();
 
@@ -115,7 +128,12 @@ sub handler {
   }
   $request->send_http_header;
   return OK if $request->header_only;
-  
+
+  #check if we know where we are
+  if ($ENV{'request.course.fn'} && !&Apache::lonnet::symbread()) { 
+    $request->internal_redirect('/adm/ambiguous'); return; 
+  }
+
   &Apache::lonhomework::send_header($request);
   
   #check if allowed to see
@@ -151,11 +169,6 @@ sub handler {
       &Apache::lonxml::error("<b>Unable to find <i>default_homework.lcpm</i></b>");
       $default='';
     }
-    if ( $target eq 'grade') { 
-      $Apache::lonxml::textredirection = 0; 
-    } else {
-      $Apache::lonxml::textredirection = 1; 
-    }
     $result = &Apache::lonxml::xmlparse($target, $problem,
 			$default.&setup_vars($target),%mystyle);
 
@@ -163,6 +176,7 @@ sub handler {
     $request->print($result);
     #$request->print(":Result ends");
     if ($target eq 'grade') {
+
       my $resultkey;
       foreach $resultkey (sort keys %Apache::lonhomework::results) {
 	&Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::results{$resultkey}");