--- loncom/homework/lonhomework.pm	2001/04/26 21:28:33	1.41
+++ loncom/homework/lonhomework.pm	2001/08/06 20:33:23	1.52
@@ -14,6 +14,11 @@ 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();
+}
 
 sub get_target {
   if ( $ENV{'request.state'} eq "published") {
@@ -30,11 +35,20 @@ sub get_target {
 	return ('web');
       }
     } else {
-      return ('grade','web');
-      if ( $ENV{'form.submitted'} eq 'edit' ) {
-	return ('modified','edit');
+      if ( $ENV{'form.problemmode'} eq 'View' ) {
+	if ( defined $ENV{'form.submitted'}) {
+	  return ('grade', 'web');
+	} else {
+	  return ('web');
+	}
+      } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
+	if ( $ENV{'form.submitted'} eq 'edit' ) {
+	  return ('modified','edit');
+	} else {
+	  return ('edit');
+	}
       } else {
-	return ('edit');
+	return ('web');
       }
     }
   }
@@ -50,7 +64,6 @@ sub setup_vars {
 sub send_header {
   my ($request)= @_;
   $request->print(&Apache::lontexconvert::header());
-  $ENV{'request.uri'}=$request->uri;
 #  $request->print('<form name='.$ENV{'form.request.prefix'}.'lonhomework method="POST" action="'.$request->uri.'">');
 }
 
@@ -156,15 +169,44 @@ sub setupheader {
   }
   $request->send_http_header;
   return OK if $request->header_only;
-  &Apache::lonhomework::send_header($request);
   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>");
@@ -174,6 +216,7 @@ sub renderpage {
     my %mystyle;
     my $result = '';
     &Apache::inputtags::initialize_inputtags;
+    &Apache::edit::initialize_edit;
     %Apache::lonhomework::results=();
     %Apache::lonhomework::history=&Apache::lonnet::restore();
     #ignore error conditions
@@ -187,7 +230,7 @@ sub renderpage {
 	  $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");
 	}
       }
-      if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
+      #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
     }
     if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); }
 
@@ -201,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");
@@ -223,15 +262,81 @@ 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,$extension) = @_;
+  my $result;
+  &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;
+      last;
+    } else {
+      $result.="<option>$name</option>";
+    }
+  }
+  return $result;
+}
+
+sub newproblem {
+  my ($request) = @_;
+
+  my $extension=$request->uri;
+  $extension=~s:^.*\.([\w]+)$:$1:;
+  &Apache::lonxml::debug("Looking for :$extension:");
+  if ($ENV{'form.template'}) {
+    use File::Copy;
+    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('',$extension);
+    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 $extension <br />
+<form action="$url" method="POST">
+<input type="submit" value="New $extension"><br />
+<select name="template">
+$templatelist
+</select>
+</form>
+</body>
+ENDNEWPROBLEM
   }
+
+  return '';
+}
+
+sub view_or_edit_menu {
+  my ($request) = @_;
+  my $url=$request->uri;
+  $request->print(<<EDITMENU);
+<body bgcolor="#FFFFFF">
+<form action="$url" method="POST">
+Would you like to <input type="submit" name="problemmode" value="View"> or
+<input type="submit" name="problemmode" value="Edit"> the problem.
+</form>
+</body>
+EDITMENU
 }
 
 sub handler {
+  #my $t0 = [&gettimeofday()];
   my $request=$_[0];
 
   if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}
 
   if (&setupheader($request)) { return OK; }
+  $ENV{'request.uri'}=$request->uri;
 
   #setup permissions
   $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
@@ -251,9 +356,10 @@ sub handler {
 
   if ($ENV{'request.state'} eq "construct") {
     if ( -e $file ) {
-      if (!(defined $ENV{'form.showproblem'})) {
+      if (!(defined $ENV{'form.problemmode'})) {
 	#first visit to problem in construction space
 	&view_or_edit_menu($request);
+	#&renderpage($request,$file);
       } else {
 	&renderpage($request,$file);
       }
@@ -265,8 +371,9 @@ sub handler {
     # just render the page normally outside of construction space
     &renderpage($request,$file);
   }
-
-  &Apache::lonhomework::send_footer($request);
+  #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;
   return OK;