--- loncom/homework/lonhomework.pm	2001/02/13 18:42:06	1.37
+++ loncom/homework/lonhomework.pm	2001/04/16 23:16:31	1.40
@@ -30,9 +30,12 @@ sub get_target {
 	return ('web');
       }
     } else {
-      #return ('edit');
-      #edit is currently broken
-      return ('web');
+      return ('grade','web');
+      if ( $ENV{'form.submitted'} eq 'edit' ) {
+	return ('modified','edit');
+      } else {
+	return ('edit');
+      }
     }
   }
   return ();
@@ -55,7 +58,7 @@ sub createmenu {
   my ($which,$request)=@_;
   if ($which eq 'grade') {
     $request->print('<script language="JavaScript"> 
-          hwkmenu=window.open("/res/adm/pages/homeworkmenu.html","LONCAPAhomeworkmenu",
+          hwkmenu=window.open("/res/adm/pages/homeworkmenu.html","homeworkremote",
                  "height=350,width=150,menubar=no");
           </script>');
   }
@@ -131,7 +134,7 @@ sub check_date {
 sub handler {
   my $request=$_[0];
   
- if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} else {$Apache::lonxml::debug=0;}
+ if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}
   
   my (@targets) = &get_target();
 
@@ -146,7 +149,6 @@ sub handler {
   #setup permissions
   $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
   $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
-  &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
 
   #check if we know where we are
   if ($ENV{'request.course.fn'} && !&Apache::lonnet::symbread()) { 
@@ -158,6 +160,7 @@ sub handler {
   }
 
   &Apache::lonhomework::send_header($request);
+  &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
   
   foreach my $target (@targets) {
     my $file=&Apache::lonnet::filelocation("",$request->uri);
@@ -171,16 +174,16 @@ sub handler {
     my $result = '';
     &Apache::inputtags::initialize_inputtags;
     %Apache::lonhomework::results=();
-    %Apache::lonhomework::history=&Apache::lonnet::restore;
+    %Apache::lonhomework::history=&Apache::lonnet::restore();
     #ignore error conditions
     my ($temp)=keys %Apache::lonhomework::history ;
     if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); } 
     if ($target eq 'web') {
       if (&Apache::lonnet::symbread() eq '') {
 	if ($ENV{'request.state'} eq "construct") {
-	  $request->print("In construction space, submissions ignored<br>");
+	  $request->print("In construction space, submissions ignored<br />");
 	} else {
-	  $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br>");
+	  $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");
 	}
       }
       if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
@@ -190,7 +193,7 @@ sub handler {
       foreach $resultkey (sort keys %Apache::lonhomework::history) {
 	&Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::history{$resultkey}");
       }
-      &Apache::lonxml::debug("\n<br>restored values^</br>\n");
+      &Apache::lonxml::debug("\n<br />restored values^</br>\n");
     }
     my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
     if ($default == -1) {
@@ -201,7 +204,20 @@ sub handler {
 			$default.&setup_vars($target),%mystyle);
 
     #$request->print("Result follows:");
-    $request->print($result);
+    if ($target eq 'modified') {
+      my $fileout = &Apache::lonnet::filelocation("",$request->uri);
+      my $filesave=$fileout.".bak";
+
+      my $fs=Apache::File->new(">$filesave");
+      print $fs $problem;
+      $request->print("<b>Making Backup to $filesave</b><br />");
+
+      my $fh=Apache::File->new(">$fileout");
+      print $fh $result;
+      $request->print("<b>Saving Modifications to $fileout</b><br />");
+    } else {
+      $request->print($result);
+    }
     #$request->print(":Result ends");
     if ($target eq 'grade') {
 
@@ -209,16 +225,17 @@ sub handler {
       foreach $resultkey (sort keys %Apache::lonhomework::results) {
 	&Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::results{$resultkey}");
       }
-      &Apache::lonxml::debug("\n<br>storing values^</br>\n");
+      &Apache::lonxml::debug("\n<br />storing values^</br>\n");
     }
     
     my ($temp) = keys %Apache::lonhomework::results;
     if ( $temp ne '' ) {
-      &Apache::lonxml::debug("Store return message:".&Apache::lonnet::cstore(%Apache::lonhomework::results));
+      &Apache::lonxml::debug("Store return message:".&Apache::lonnet::cstore(\%Apache::lonhomework::results));
     }
   }
   &Apache::lonhomework::send_footer($request);
-  
+  # always turn of debug messages
+  $Apache::lonxml::debug=0;
   return OK;
 
 }