--- loncom/homework/lonhomework.pm 2001/02/13 18:42:06 1.37
+++ loncom/homework/lonhomework.pm 2001/04/26 21:28:33 1.41
@@ -30,9 +30,12 @@ sub get_target {
return ('web');
}
} else {
- #return ('edit');
- #edit is currently broken
- return ('web');
+ return ('grade','web');
+ if ( $ENV{'form.submitted'} eq 'edit' ) {
+ return ('modified','edit');
+ } else {
+ return ('edit');
+ }
}
}
return ();
@@ -55,7 +58,7 @@ sub createmenu {
my ($which,$request)=@_;
if ($which eq 'grade') {
$request->print('');
}
@@ -128,13 +131,24 @@ sub check_date {
return ($status,$datemsg);
}
-sub handler {
- my $request=$_[0];
-
- if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} else {$Apache::lonxml::debug=0;}
-
- my (@targets) = &get_target();
+sub showhash {
+ my (%hash) = @_;
+ my $resultkey;
+ foreach $resultkey (sort keys %hash) {
+ &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");
+ }
+ &Apache::lonxml::debug("\n
restored values^\n");
+ return '';
+}
+
+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 +156,41 @@ sub handler {
}
$request->send_http_header;
return OK if $request->header_only;
+ &Apache::lonhomework::send_header($request);
+ return ''
+}
- #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:");
-
- #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(" Unable to find $file");
$problem='';
}
-
+
my %mystyle;
my $result = '';
&Apache::inputtags::initialize_inputtags;
%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
");
+ $request->print("In construction space, submissions ignored
");
} else {
- $request->print("Browsing or ambiguous reference, submissions ignored
");
+ $request->print("Browsing or ambiguous reference, submissions ignored
");
}
}
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
restored values^\n");
- }
+ 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("Unable to find default_homework.lcpm");
@@ -201,24 +200,75 @@ 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("Making Backup to $filesave
");
+
+ my $fh=Apache::File->new(">$fileout");
+ print $fh $result;
+ $request->print("Saving Modifications to $fileout
");
+ } 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
storing values^\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));
}
}
+}
+
+sub handler {
+ my $request=$_[0];
+
+ if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}
+
+ if (&setupheader($request)) { return OK; }
+
+ #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.showproblem'})) {
+ #first visit to problem in construction space
+ &view_or_edit_menu($request);
+ } 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);
-
+ # always turn off debug messages
+ $Apache::lonxml::debug=0;
return OK;
}