--- loncom/interface/lonevaluate.pm	2002/08/26 12:47:28	1.10
+++ loncom/interface/lonevaluate.pm	2003/07/05 10:07:11	1.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Evaluate
 #
-# $Id: lonevaluate.pm,v 1.10 2002/08/26 12:47:28 www Exp $
+# $Id: lonevaluate.pm,v 1.12 2003/07/05 10:07:11 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -95,8 +95,10 @@ sub handler {
 <title>Evaluation submitted</title>
 <script>
     function go() {
-	if (window.name!='LONcatInfo') {
+	if ((window.name=='loncapaclient')) {
             window.location='/res/$feedurl';
+        } else {
+            self.close();
         }
     }
 </script>
@@ -125,7 +127,8 @@ ENDHEADER
 
     foreach my $item (@items) {
        unless ($item eq 'comments') {
-           unless ($item eq 'timestamp') {
+           unless (($item eq 'timestamp') || 
+                   (!defined($currenteval{$prefix.$item}))) {
               $dialold.=
                    'document.evaluation.'.$item.'.selectedIndex='.
                    $currenteval{$prefix.$item}.";\n";