Diff for /loncom/homework/lonhomework.pm between versions 1.64 and 1.69

version 1.64, 2001/12/04 14:51:19 version 1.69, 2002/01/17 12:23:31
Line 34  use strict; Line 34  use strict;
 use Apache::style;  use Apache::style;
 use Apache::lonxml;  use Apache::lonxml;
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::lonplot;
 use Apache::inputtags;  use Apache::inputtags;
 use Apache::structuretags;  use Apache::structuretags;
 use Apache::randomlabel;  use Apache::randomlabel;
Line 43  use Apache::outputtags; Line 44  use Apache::outputtags;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 #use Time::HiRes qw( gettimeofday tv_interval );  #use Time::HiRes qw( gettimeofday tv_interval );
   
 sub BEGIN {  BEGIN {
   &Apache::lonxml::register_insert();    &Apache::lonxml::register_insert();
 }  }
   
 sub get_target {  sub get_target {
   if ( $ENV{'request.state'} eq "published") {    if ( $ENV{'request.state'} eq "published") {
       if ( defined($ENV{'form.grade_target'}) 
    && ($Apache::lonhomework::viewgrades == 'F' )) {
         return ($ENV{'form.grade_target'});
       }
     if ( defined($ENV{'form.submitted'})) {      if ( defined($ENV{'form.submitted'})) {
       return ('grade', 'web');        return ('grade', 'web');
     } else {      } else {
Line 203  sub setupheader { Line 208  sub setupheader {
   } else {    } else {
     $request->content_type('text/html');      $request->content_type('text/html');
   }    }
   if (!$Apache::lonxml::debug) { &Apache::loncommon::no_cache($request); }    if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {
       &Apache::loncommon::no_cache($request);
     }
   $request->send_http_header;    $request->send_http_header;
   return OK if $request->header_only;    return OK if $request->header_only;
   return ''    return ''
Line 345  sub get_template_list { Line 352  sub get_template_list {
 }  }
   
 sub newproblem {  sub newproblem {
   my ($request) = @_;      my ($request) = @_;
       my $extension=$request->uri;
   my $extension=$request->uri;      $extension=~s:^.*\.([\w]+)$:$1:;
   $extension=~s:^.*\.([\w]+)$:$1:;      &Apache::lonxml::debug("Looking for :$extension:");
   &Apache::lonxml::debug("Looking for :$extension:");      if ($ENV{'form.template'}) {
   if ($ENV{'form.template'}) {   use File::Copy;
     use File::Copy;   my $file = &get_template_list($ENV{'form.template'},$extension);
     my $file = &get_template_list($ENV{'form.template'},$extension);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
     my $dest = &Apache::lonnet::filelocation("",$request->uri);   copy($file,$dest);
     copy($file,$dest);   &renderpage($request,$dest);
     &renderpage($request,$file);      } elsif($ENV{'form.newfile'}) {
   } else {   # I don't like hard-coded filenames but for now, this will work.
     my $templatelist=&get_template_list('',$extension);   use File::Copy;
     my $url=$request->uri;   my $templatefilename = 
     my $dest = &Apache::lonnet::filelocation("",$request->uri);      $request->dir_config('lonIncludes').'/templates/blank.problem';
     $request->print(<<ENDNEWPROBLEM);   &Apache::lonxml::debug("$templatefilename");
    my $dest = &Apache::lonnet::filelocation("",$request->uri);
    copy($templatefilename,$dest);
    &renderpage($request,$dest);
       }else {
    my $templatelist=&get_template_list('',$extension);
    my $url=$request->uri;
    my $dest = &Apache::lonnet::filelocation("",$request->uri);
    if (!defined($templatelist)) {
       # We didn't find a template, so just create a blank problem.
       $request->print(<<ENDNEWPROBLEM);
   <body bgcolor="#FFFFFF">
   The requested file $url doesn\'t exist. You can create a new $extension <br />
   <form action="$url" method="POST">
   <input type="submit" name="newfile" value="New $extension"><br />
   </form>
   </body>
   ENDNEWPROBLEM
               return '';
           }
    $request->print(<<ENDNEWPROBLEM);
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF">
 The request file $url doesn\'t exist. You can create a new $extension <br />  The requested file $url doesn\'t exist. You can create a new $extension <br />
 <form action="$url" method="POST">  <form action="$url" method="POST">
 <input type="submit" value="New $extension"><br />  <input type="submit" value="New $extension"><br />
 <select name="template">  <select name="template">
Line 371  $templatelist Line 398  $templatelist
 </form>  </form>
 </body>  </body>
 ENDNEWPROBLEM  ENDNEWPROBLEM
   }      }
       return '';
   return '';  
 }  }
   
 sub view_or_edit_menu {  sub view_or_edit_menu {

Removed from v.1.64  
changed lines
  Added in v.1.69


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>