--- loncom/homework/lonhomework.pm	2001/06/12 22:42:55	1.46
+++ loncom/homework/lonhomework.pm	2001/07/18 18:45:37	1.49
@@ -14,7 +14,7 @@ use Apache::response;
 use Apache::hint;
 use Apache::outputtags;
 use Apache::Constants qw(:common);
-
+#use Time::HiRes qw( gettimeofday tv_interval );
 
 sub BEGIN {
   &Apache::lonxml::register_insert();
@@ -172,11 +172,41 @@ sub setupheader {
   return ''
 }
 
+sub handle_save_or_undo {
+  my ($request,$problem,$result) = @_;
+  my $fileout = &Apache::lonnet::filelocation("",$request->uri);
+  my $filesave=$fileout.".bak";
+
+  if ($ENV{'form.Undo'} eq 'undo') {
+    if (copy($filesave,$fileout)) {
+      $request->print("<b>Undid changes, Copied $filesave to $fileout<br /></b>");
+    } else {
+      $request->print("<font color=\"red\" size=\"+1\"><b>Unable to undo, unable to copy $filesave to $fileout<br /></b></font>");
+    }
+  } else {
+    my $fs=Apache::File->new(">$filesave");
+    if (defined($fs)) {
+      print $fs $$problem;
+      $request->print("<b>Making Backup to $filesave</b><br />");
+    } else {
+      $request->print("<font color=\"red\" size=\"+1\"><b>Unable to make backup $filesave</b></font>");
+    }
+    my $fh=Apache::File->new(">$fileout");
+    if (defined($fh)) {
+      print $fh $$result;
+      $request->print("<b>Saving Modifications to $fileout</b><br />");
+    } else {
+      $request->print("<font color=\"red\" size=\"+1\"><b>Unable to write to $fileout</b></font>");
+    }
+  }
+}
+
 sub renderpage {
   my ($request,$file) = @_;
 
   my (@targets) = &get_target();
   foreach my $target (@targets) {
+    #my $t0 = [&gettimeofday()];
     my $problem=&Apache::lonnet::getfile($file);
     if ($problem == -1) {
       &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");
@@ -214,17 +244,13 @@ sub renderpage {
 
     #$request->print("Result follows:");
     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 />");
+      &handle_save_or_undo($request,\$problem,\$result);
     } else {
+      #my $td=&tv_interval($t0);
+      #if ( $Apache::lonxml::debug) {
+	#$result =~ s:</body>::;
+	#$result.="<br />Spent $td seconds processing target $target\n</body>";
+      #}
       $request->print($result);
     }
     #$request->print(":Result ends");
@@ -236,15 +262,17 @@ sub renderpage {
       &Apache::lonxml::debug("Store return message:".
 			     &Apache::lonnet::cstore(\%Apache::lonhomework::results));
     }
+    #my $td=&tv_interval($t0);
   }
 }
 
 # with no arg it returns a HTML <option> list of the template titles
 # with one arg it returns the filename associated with the arg passed
 sub get_template_list {
-  my ($namewanted) = @_;
+  my ($namewanted,$extension) = @_;
   my $result;
-  foreach my $file (</home/httpd/html/res/adm/includes/templates/*.problem>) {
+  &Apache::lonxml::debug("Looking for :$extension:");
+  foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {
     my $name=&Apache::lonnet::metadata($file,'title');
     if ($namewanted && ($name eq $namewanted)) {
       $result=$file;
@@ -261,13 +289,16 @@ sub newproblem {
 
   if ($ENV{'form.template'}) {
     use File::Copy;
-    my $file = &get_template_list($ENV{'form.template'});
+    my $extension=$request->uri;
+    $extension=~s:\.([\w]+)$:$1:;
+    my $file = &get_template_list($ENV{'form.template'},$extension);
     my $dest = &Apache::lonnet::filelocation("",$request->uri);
     copy($file,$dest);
     &renderpage($request,$file);
   } else {
     my $templatelist=&get_template_list();
     my $url=$request->uri;
+    my $dest = &Apache::lonnet::filelocation("",$request->uri);
     $request->print(<<ENDNEWPROBLEM);
 <body bgcolor="#FFFFFF">
 The request file $url doesn\'t exist. You can create a new problem <br />
@@ -298,9 +329,10 @@ EDITMENU
 }
 
 sub handler {
+  #my $t0 = [&gettimeofday()];
   my $request=$_[0];
 
-  #if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}
+  if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}
 
   if (&setupheader($request)) { return OK; }
   $ENV{'request.uri'}=$request->uri;
@@ -338,7 +370,8 @@ sub handler {
     # just render the page normally outside of construction space
     &renderpage($request,$file);
   }
-
+  #my $td=&tv_interval($t0);
+  #&Apache::lonxml::debug("Spent $td seconds processing");
   # &Apache::lonhomework::send_footer($request);
   # always turn off debug messages
   $Apache::lonxml::debug=0;
