--- loncom/homework/lonhomework.pm	2001/06/26 21:39:15	1.47
+++ loncom/homework/lonhomework.pm	2001/07/18 20:08:34	1.50
@@ -269,9 +269,10 @@ sub renderpage {
 # 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;
@@ -286,20 +287,24 @@ sub get_template_list {
 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'});
+    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 $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 problem <br />
+The request file $url doesn\'t exist. You can create a new $extension <br />
 <form action="$url" method="POST">
-<input type="submit" value="New Problem"><br />
+<input type="submit" value="New $extension"><br />
 <select name="template">
 $templatelist
 </select>
@@ -328,7 +333,7 @@ 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;
