--- loncom/homework/lonhomework.pm 2001/02/19 14:53:54 1.38 +++ loncom/homework/lonhomework.pm 2001/11/05 22:49:14 1.62 @@ -1,7 +1,7 @@ # The LON-CAPA Homework handler # Guy Albertelli # 11/30 Gerd Kortemeyer -# 6/1 Gerd Kortemeyer +# 6/1,8/17,8/18 Gerd Kortemeyer package Apache::lonhomework; use strict; @@ -10,29 +10,48 @@ use Apache::lonxml; use Apache::lonnet; use Apache::inputtags; use Apache::structuretags; +use Apache::randomlabel; 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") { - if ( defined $ENV{'form.submitted'}) { + if ( defined($ENV{'form.submitted'})) { return ('grade', 'web'); } else { return ('web'); } } elsif ($ENV{'request.state'} eq "construct") { - if ( defined $ENV{'form.preview'}) { - if ( defined $ENV{'form.submitted'}) { + if ( defined($ENV{'form.preview'})) { + if ( defined($ENV{'form.submitted'})) { return ('grade', 'web'); } else { return ('web'); } } else { - #return ('edit'); - #edit is currently broken - return ('web'); + if ( $ENV{'form.problemmode'} eq 'View' ) { + if ( defined($ENV{'form.submitted'}) && + (!defined($ENV{'form.resetdata'})) ) { + return ('grade', 'web','answer'); + } else { + return ('web','answer'); + } + } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) { + if ( $ENV{'form.submitted'} eq 'edit' ) { + return ('modified','edit'); + } else { + return ('edit'); + } + } else { + return ('web'); + } } } return (); @@ -47,7 +66,6 @@ sub setup_vars { sub send_header { my ($request)= @_; $request->print(&Apache::lontexconvert::header()); - $ENV{'request.uri'}=$request->uri; # $request->print('