--- loncom/homework/lonhomework.pm	2001/02/07 00:29:30	1.36
+++ loncom/homework/lonhomework.pm	2001/06/12 22:42:55	1.46
@@ -15,6 +15,11 @@ use Apache::hint;
 use Apache::outputtags;
 use Apache::Constants qw(:common);
 
+
+sub BEGIN {
+  &Apache::lonxml::register_insert();
+}
+
 sub get_target {
   if ( $ENV{'request.state'} eq "published") {
     if ( defined $ENV{'form.submitted'}) {
@@ -30,9 +35,21 @@ sub get_target {
 	return ('web');
       }
     } else {
-      #return ('edit');
-      #edit is currently broken
-      return ('web');
+      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 ('web');
+      }
     }
   }
   return ();
@@ -47,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.'">');
 }
 
@@ -55,7 +71,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>');
   }
@@ -128,13 +144,24 @@ sub check_date {
   return ($status,$datemsg);
 }
 
-sub handler {
-  my $request=$_[0];
+sub showhash {
+  my (%hash) = @_;
+  my $resultkey;
+  foreach $resultkey (sort keys %hash) {
+    &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");
+  }
+  &Apache::lonxml::debug("\n<br />restored values^</br>\n");
+  return '';
+}
 
-  if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} else {$Apache::lonxml::debug=0;}
-  
-  my (@targets) = &get_target();
+sub setuppermissions {
+  $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
+  $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+  return ''
+}
 
+sub setupheader {
+  my $request=$_[0];
   if ($ENV{'browser.mathml'}) {
     $request->content_type('text/xml');
   } else {
@@ -142,56 +169,41 @@ sub handler {
   }
   $request->send_http_header;
   return OK if $request->header_only;
+  return ''
+}
 
-  #setup permissions
-  $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre');
-  $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr');
-  &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()) { 
-    # if we are browsing we might not be able to know where we are
-    if ($Apache::lonhomework::browse ne 'F') {
-      #should know where we are, so ask
-      $request->internal_redirect('/adm/ambiguous'); return; 
-    }
-  }
+sub renderpage {
+  my ($request,$file) = @_;
 
-  &Apache::lonhomework::send_header($request);
-  
+  my (@targets) = &get_target();
   foreach my $target (@targets) {
-    my $file=&Apache::lonnet::filelocation("",$request->uri);
     my $problem=&Apache::lonnet::getfile($file);
     if ($problem == -1) {
       &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");
       $problem='';
     }
-    
+
     my %mystyle;
     my $result = '';
     &Apache::inputtags::initialize_inputtags;
+    &Apache::edit::initialize_edit;
     %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); }
-    }
-    if ($target eq 'grade') {
-      my $resultkey;
-      foreach $resultkey (sort keys %Apache::lonhomework::history) {
-	&Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::history{$resultkey}");
-      }
-      &Apache::lonxml::debug("\n<br>restored values^</br>\n");
+      #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
     }
+    if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); }
+
     my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
     if ($default == -1) {
       &Apache::lonxml::error("<b>Unable to find <i>default_homework.lcpm</i></b>");
@@ -201,24 +213,135 @@ 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') {
+    if ($target eq 'grade') { &showhash(%Apache::lonhomework::results); }
 
-      my $resultkey;
-      foreach $resultkey (sort keys %Apache::lonhomework::results) {
-	&Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::results{$resultkey}");
-      }
-      &Apache::lonxml::debug("\n<br>storing values^</br>\n");
-    }
-    
+    #store new values
     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));
+    }
+  }
+}
+
+# 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 $result;
+  foreach my $file (</home/httpd/html/res/adm/includes/templates/*.problem>) {
+    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) = @_;
+
+  if ($ENV{'form.template'}) {
+    use File::Copy;
+    my $file = &get_template_list($ENV{'form.template'});
+    my $dest = &Apache::lonnet::filelocation("",$request->uri);
+    copy($file,$dest);
+    &renderpage($request,$file);
+  } else {
+    my $templatelist=&get_template_list();
+    my $url=$request->uri;
+    $request->print(<<ENDNEWPROBLEM);
+<body bgcolor="#FFFFFF">
+The request file $url doesn\'t exist. You can create a new problem <br />
+<form action="$url" method="POST">
+<input type="submit" value="New Problem"><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 $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'});
+  $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+  &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
+
+  my $file=&Apache::lonnet::filelocation("",$request->uri);
+
+  #check if we know where we are
+  if ($ENV{'request.course.fn'} && !&Apache::lonnet::symbread()) { 
+    # if we are browsing we might not be able to know where we are
+    if ($Apache::lonhomework::browse ne 'F') {
+      #should know where we are, so ask
+      $request->internal_redirect('/adm/ambiguous'); return;
+    }
+  }
+
+  if ($ENV{'request.state'} eq "construct") {
+    if ( -e $file ) {
+      if (!(defined $ENV{'form.problemmode'})) {
+	#first visit to problem in construction space
+	&view_or_edit_menu($request);
+	#&renderpage($request,$file);
+      } else {
+	&renderpage($request,$file);
+      }
+    } else {
+      # requested file doesn't exist in contruction space
+      &newproblem($request);
     }
+  } else {
+    # just render the page normally outside of construction space
+    &renderpage($request,$file);
   }
-  &Apache::lonhomework::send_footer($request);
-  
+
+  # &Apache::lonhomework::send_footer($request);
+  # always turn off debug messages
+  $Apache::lonxml::debug=0;
   return OK;
 
 }