Diff for /loncom/homework/lonhomework.pm between versions 1.41 and 1.42

version 1.41, 2001/04/26 21:28:33 version 1.42, 2001/05/04 21:20:31
Line 30  sub get_target { Line 30  sub get_target {
  return ('web');   return ('web');
       }        }
     } else {      } else {
       return ('grade','web');        if ( $ENV{'form.problemmode'} eq 'View' ) {
       if ( $ENV{'form.submitted'} eq 'edit' ) {   if ( defined $ENV{'form.submitted'}) {
  return ('modified','edit');    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 {        } else {
  return ('edit');   return ('web');
       }        }
     }      }
   }    }
Line 50  sub setup_vars { Line 59  sub setup_vars {
 sub send_header {  sub send_header {
   my ($request)= @_;    my ($request)= @_;
   $request->print(&Apache::lontexconvert::header());    $request->print(&Apache::lontexconvert::header());
   $ENV{'request.uri'}=$request->uri;  
 #  $request->print('<form name='.$ENV{'form.request.prefix'}.'lonhomework method="POST" action="'.$request->uri.'">');  #  $request->print('<form name='.$ENV{'form.request.prefix'}.'lonhomework method="POST" action="'.$request->uri.'">');
 }  }
   
Line 156  sub setupheader { Line 164  sub setupheader {
   }    }
   $request->send_http_header;    $request->send_http_header;
   return OK if $request->header_only;    return OK if $request->header_only;
   &Apache::lonhomework::send_header($request);  
   return ''    return ''
 }  }
   
Line 226  sub renderpage { Line 233  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 $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 {  sub handler {
   my $request=$_[0];    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; }    if (&setupheader($request)) { return OK; }
     $ENV{'request.uri'}=$request->uri;
   
   #setup permissions    #setup permissions
   $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});    $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
Line 251  sub handler { Line 317  sub handler {
   
   if ($ENV{'request.state'} eq "construct") {    if ($ENV{'request.state'} eq "construct") {
     if ( -e $file ) {      if ( -e $file ) {
       if (!(defined $ENV{'form.showproblem'})) {        if (!(defined $ENV{'form.problemmode'})) {
  #first visit to problem in construction space   #first visit to problem in construction space
  &view_or_edit_menu($request);   &view_or_edit_menu($request);
    #&renderpage($request,$file);
       } else {        } else {
  &renderpage($request,$file);   &renderpage($request,$file);
       }        }

Removed from v.1.41  
changed lines
  Added in v.1.42


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