--- loncom/homework/lonhomework.pm 2001/08/06 18:24:37 1.51 +++ loncom/homework/lonhomework.pm 2003/05/09 22:24:05 1.123 @@ -1,363 +1,598 @@ -# The LON-CAPA homework handler -# -# Handles homework. +# The LearningOnline Network with CAPA +# The LON-CAPA Homework handler # -# YEAR=2000 -# 7/25,8/2,8/7,8/8,8/11,9/14,9/19,10/2,10/5,10/11,11/7,11/21 Guy Albertelli +# $Id: lonhomework.pm,v 1.123 2003/05/09 22:24:05 albertel Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# +# Guy Albertelli # 11/30 Gerd Kortemeyer -# 12/4,12/8,12/12,12/15,12/19,12/21 Guy Albertelli -# YEAR=2001 -# 1/6,1/8,1/9,1/10,1/11,1/12,1/15,1/25,2/7,2/13,2/19,4/16,4/26 Guy Albertelli -# 5/4,5/13,5/21 Guy Albertelli -# 6/1 Gerd Kortemeyer -# 6/5,6/12,6/26,7/2,7/18 Guy Albertelli -# 8/6 Scott Harrison +# 6/1,8/17,8/18 Gerd Kortemeyer +# 7/18 Jeremy Bowers package Apache::lonhomework; use strict; -use Apache::style; -use Apache::lonxml; -use Apache::lonnet; -use Apache::inputtags; -use Apache::structuretags; -use Apache::response; -use Apache::hint; -use Apache::outputtags; +use Apache::style(); +use Apache::lonxml(); +use Apache::lonnet(); +use Apache::lonplot(); +use Apache::inputtags(); +use Apache::structuretags(); +use Apache::randomlabel(); +use Apache::response(); +use Apache::hint(); +use Apache::outputtags(); +use Apache::caparesponse(); +use Apache::radiobuttonresponse(); +use Apache::optionresponse(); +use Apache::imageresponse(); +use Apache::essayresponse(); +use Apache::externalresponse(); +use Apache::rankresponse(); +use Apache::matchresponse(); +#use Apache::chemresponse(); use Apache::Constants qw(:common); +use HTML::Entities(); +use Apache::loncommon(); #use Time::HiRes qw( gettimeofday tv_interval ); -# ======================================================================= BEGIN -sub BEGIN { +BEGIN { &Apache::lonxml::register_insert(); } -# =============================================== Get target (returns an array) sub get_target { - if ( $ENV{'request.state'} eq "published") { - if ( defined $ENV{'form.submitted'}) { - return ('grade','web'); + if ( $ENV{'request.state'} eq "published") { + if ( defined($ENV{'form.grade_target'} ) + && ($ENV{'form.grade_target'} eq 'tex')) { + return ($ENV{'form.grade_target'}); + } elsif ( defined($ENV{'form.grade_target'} ) + && ($Apache::lonhomework::viewgrades eq 'F' )) { + return ($ENV{'form.grade_target'}); + } + + if ( defined($ENV{'form.submitted'}) && + ( !defined($ENV{'form.resetdata'}))) { + return ('grade', 'web'); + } else { + return ('web'); + } + } elsif ($ENV{'request.state'} eq "construct") { + if ( defined($ENV{'form.grade_target'}) ) { + return ($ENV{'form.grade_target'}); + } + if ( defined($ENV{'form.preview'})) { + if ( defined($ENV{'form.submitted'})) { + return ('grade', 'web'); + } else { + return ('web'); + } + } else { + if ( $ENV{'form.problemmode'} eq 'View' || + $ENV{'form.problemmode'} eq 'Discard Edits and View') { + if ( defined($ENV{'form.submitted'}) && + (!defined($ENV{'form.resetdata'})) ) { + return ('grade', 'web','answer'); } else { - return ('web'); + return ('web','answer'); } - } elsif ($ENV{'request.state'} eq "construct") { - if ( defined $ENV{'form.preview'}) { - if ( defined $ENV{'form.submitted'}) { - return ('grade','web'); - } else { - return ('web'); - } + } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) { + if ( $ENV{'form.submitted'} eq 'edit' ) { + if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) { + return ('modified','web','answer'); + } else { + return ('modified','edit'); + } } else { - if ( $ENV{'form.problemmode'} eq 'View' ) { - if ( defined $ENV{'form.submitted'}) { - 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 { - return ('web'); - } + return ('edit'); } + } else { + return ('web'); + } } - return (); + } + return (); } -# ===================================== Set up variables (return scalar string) sub setup_vars { - my ($target) = @_; - return ';' + my ($target) = @_; + return ';' # return ';$external::target='.$target.';'; } -# ================================================================= Send header sub send_header { - my ($request) = @_; - $request->print(&Apache::lontexconvert::header()); + my ($request)= @_; + $request->print(&Apache::lontexconvert::header()); # $request->print('
'); } -# ================================================================= Create menu sub createmenu { - my ($which,$request) = @_; - if ($which eq 'grade') { - $request->print(''); - } + my ($which,$request)=@_; + if ($which eq 'grade') { + $request->print(''); + } } -# ================================================================= Send footer sub send_footer { - my ($request) = @_; + my ($request)= @_; # $request->print('
'); - $request->print(&Apache::lontexconvert::footer()); + $request->print(&Apache::lontexconvert::footer()); } -$Apache::lonxml::browse = ''; +$Apache::lonxml::browse=''; -# =============================================== Check date (returns an array) -sub check_date { - my ($id) = @_; - my $date =''; - my $status = ''; - my $datemsg = ''; - my $lastdate = ''; - my $temp; - my $type; - my $passed; - &Apache::lonxml::debug("checking for part :$id:"); - foreach $temp ("opendate","duedate","answerdate") { - $lastdate = $date; - $date = &Apache::lonnet::EXT("resource.$id.$temp"); - &Apache::lonxml::debug("found :$date: for :$temp:"); - if ($date eq '') { - $date = "an unknown date"; $passed = 0; - } elsif ($date eq 'con_lost') { - $date = "an indeterminate date"; $passed = 0; - } else { - if (time < $date) { $passed = 0; } else { $passed = 1; } - $date = localtime $date; - } - if (!$passed) { $type = $temp; last; } +# JB, 9/24/2002: Any changes in this function may require a change +# in lonnavmaps::resource::getDateStatus. +sub check_access { + my ($id) = @_; + my $date =''; + my $status; + my $datemsg = ''; + my $lastdate = ''; + my $temp; + my $type; + my $passed; + + if ($ENV{'request.state'} eq "construct") { + &Apache::lonxml::debug("in construction ignoring dates"); + $status='CAN_ANSWER'; + $datemsg='is in under construction'; + return ($status,$datemsg); + } + + &Apache::lonxml::debug("checking for part :$id:"); + &Apache::lonxml::debug("time:".time); + foreach $temp ("opendate","duedate","answerdate") { + $lastdate = $date; + $date = &Apache::lonnet::EXT("resource.$id.$temp"); + my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type"); + if ($thistype =~ /^(con_lost|no_such_host)/ || + $date =~ /^(con_lost|no_such_host)/) { + $status='UNAVAILABLE'; + $date="may open later."; + return($status,$date); + } + if ($thistype eq 'date_interval') { + if ($temp eq 'opendate') { + $date=&Apache::lonnet::EXT("resource.$id.duedate")-$date; + } + if ($temp eq 'answerdate') { + $date=&Apache::lonnet::EXT("resource.$id.duedate")+$date; + } + } + &Apache::lonxml::debug("found :$date: for :$temp:"); + if ($date eq '') { + $date = "an unknown date"; $passed = 0; + } elsif ($date eq 'con_lost') { + $date = "an indeterminate date"; $passed = 0; + } else { + if (time < $date) { $passed = 0; } else { $passed = 1; } + $date = localtime $date; } - &Apache::lonxml::debug("have :$type:$passed:"); - if ($passed) { - $status = 'SHOW_ANSWER'; - $datemsg = $date; - } elsif ($type eq 'opendate') { - $status = 'CLOSED'; - $datemsg = "will open on $date"; - } elsif ($type eq 'duedate') { - $status = 'CAN_ANSWER'; - $datemsg = "is due at $date"; - } elsif ($type eq 'answerdate') { - $status = 'CLOSED'; - $datemsg = "was due on $lastdate, and answers will be available on ". - "$date"; - } - if ($status eq 'CAN_ANSWER') { - #check #tries - my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; - my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); - if ( $tries eq '' ) { $tries = '0'; } - if ( $maxtries eq '' ) { $maxtries = '2'; } - if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } - } - &Apache::lonxml::debug("sending back :$status:$datemsg:"); - if (($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED')) { - &Apache::lonxml::debug("should be allowed to browse a resource when ". - "closed"); - $status = 'CAN_ANSWER'; - $datemsg = 'is closed but you are allowed to view it'; - } - if ($ENV{'request.state'} eq "construct") { - &Apache::lonxml::debug("in construction ignoring dates"); - $status = 'CAN_ANSWER'; - $datemsg = 'is in under construction'; + if (!$passed) { $type=$temp; last; } + } + &Apache::lonxml::debug("have :$type:$passed:"); + if ($passed) { + $status='SHOW_ANSWER'; + $datemsg=$date; + } elsif ($type eq 'opendate') { + $status='CLOSED'; + $datemsg = "will open on $date"; + } elsif ($type eq 'duedate') { + $status='CAN_ANSWER'; + $datemsg = "is due at $date"; + } elsif ($type eq 'answerdate') { + $status='CLOSED'; + $datemsg = "was due on $lastdate, and answers will be available on $date"; + } + if ($status eq 'CAN_ANSWER') { + #check #tries, and if correct. + my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; + my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); + if ( $tries eq '' ) { $tries = '0'; } + if ( $maxtries eq '' ) { $maxtries = '2'; } + if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } + if($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/ + && lc($Apache::lonhomework::problemstatus) ne 'no') { + $status = 'CANNOT_ANSWER'; } - return ($status,$datemsg); + } + + if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') && + (!$Apache::lonhomework::history{"resource.0.outtoken"})) { + return ('UNCHECKEDOUT','needs to be checked out'); + } + + + &Apache::lonxml::debug("sending back :$status:$datemsg:"); + if (($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED')) { + &Apache::lonxml::debug("should be allowed to browse a resource when closed"); + $status='CAN_ANSWER'; + $datemsg='is closed but you are allowed to view it'; + } + + return ($status,$datemsg); } -# ================================================================== Shows hash sub showhash { - my (%hash) = @_; - my $resultkey; - foreach $resultkey (sort keys %hash) { - &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}"); + my (%hash) = @_; + &showhashsubset(\%hash,'.'); + return ''; +} + +sub showarray { + my ($array)=@_; + my $string="("; + foreach my $elm (@{ $array }) { + if (ref($elm)) { + if ($elm =~ /ARRAY/ ) { + $string.=&showarray($elm); + } + } else { + $string.="$elm," + } } - &Apache::lonxml::debug("\n
restored values^
\n"); - return ''; + chop($string); + $string.=")"; + return $string; +} + +sub showhashsubset { + my ($hash,$keyre) = @_; + my $resultkey; + foreach $resultkey (sort keys %$hash) { + if ($resultkey =~ /$keyre/) { + if (ref($$hash{$resultkey})) { + if ($$hash{$resultkey} =~ /ARRAY/ ) { + &Apache::lonxml::debug("$resultkey ---- ". + &showarray($$hash{$resultkey})); + } elsif ($$hash{$resultkey} =~ /HASH/ ) { + &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); + &showhashsubset($$hash{$resultkey},'.'); + } else { + &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); + } + } else { + &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); + } + } + } + &Apache::lonxml::debug("\n
restored values^
\n"); + return ''; } -# =========================================================== Setup permissions sub setuppermissions { - $Apache::lonhomework::browse = &Apache::lonnet::allowed('bre', - $ENV{'request.filename'}); - $Apache::lonhomework::viewgrades = &Apache::lonnet::allowed('vgr', - $ENV{'request.course.id'}); - return ''; + $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'}); + $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}); + return '' } -# ================================================================ Setup header sub setupheader { - my $request = $_[0]; + my $request=$_[0]; if ($ENV{'browser.mathml'}) { $request->content_type('text/xml'); } else { $request->content_type('text/html'); } + $request->content_encoding('UTF-8'); + if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) { + &Apache::loncommon::no_cache($request); + } $request->send_http_header; return OK if $request->header_only; - return ''; + return '' } -# ========================================================= Handle save or undo sub handle_save_or_undo { - my ($request,$problem,$result) = @_; - my $fileout = &Apache::lonnet::filelocation("",$request->uri); - my $filesave = $fileout.".bak"; - if ($ENV{'form.Undo'} eq 'undo') { - if (copy($filesave,$fileout)) { - $request->print("Undid changes, Copied $filesave to $fileout". - "
"); - } else { - $request->print("Unable to ". - "undo, unable to copy $filesave to $fileout
"); - } + my ($request,$problem,$result) = @_; + my $file = &Apache::lonnet::filelocation("",$request->uri); + my $filebak =$file.".bak"; + my $filetmp =$file.".tmp"; + my $error=0; + + if ($ENV{'form.Undo'} eq 'undo') { + my $error=0; + if (!copy($file,$filetmp)) { $error=1; } + if ((!$error) && (!copy($filebak,$file))) { $error=1; } + if ((!$error) && (!move($filetmp,$filebak))) { $error=1; } + if (!$error) { + $request->print("

Undid changes, Switched $filebak and $file

"); } else { - my $fs=Apache::File->new(">$filesave"); - if (defined($fs)) { - print $fs $$problem; - $request->print("Making Backup to $filesave
"); - } else { - $request->print("Unable to ". - "make backup $filesave"); - } - my $fh=Apache::File->new(">$fileout"); - if (defined($fh)) { - print $fh $$result; - $request->print("Saving Modifications to $fileout
"); - } else { - $request->print("Unable to ". - "write to $fileout"); - } + $request->print("

Unable to undo, unable to switch $filebak and $file

"); + $error=1; + } + } else { + my $fs=Apache::File->new(">$filebak"); + if (defined($fs)) { + print $fs $$problem; + $request->print("Making Backup to $filebak
"); + } else { + $request->print("Unable to make backup $filebak"); + $error=2; + } + my $fh=Apache::File->new(">$file"); + if (defined($fh)) { + print $fh $$result; + $request->print("Saving Modifications to $file
"); + } else { + $request->print("Unable to write to $file"); + $error|=4; } + } + return $error; } -# ================================================================= Render page -sub renderpage { +sub analyze_header { + my ($request) = @_; + my $result.=' + Analyzing a problem + +
+ + +
+ +
+ List of possible answers: +
'; + $request->print($result); + $request->rflush(); +} + +sub analyze_footer { + my ($request) = @_; + my $result=''; + $request->print($result); + $request->rflush(); +} + +sub analyze { my ($request,$file) = @_; - - my (@targets) = &get_target(); - foreach my $target (@targets) { - #my $t0 = [&gettimeofday()]; - 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::edit::initialize_edit; - %Apache::lonhomework::results=(); - %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
"); - } else { - $request->print("Browsing or ". - "ambiguous reference, submissions ". - "ignored
"); - } + &Apache::lonxml::debug("Analyze"); + my $result; + my %overall; + my %allparts; + my $rndseed=$ENV{'form.rndseed'}; + &analyze_header($request); + my %prog_state= + &Apache::lonhtmlcommon::Create_PrgWin($request,'Analyze Progress', + 'Getting Problem Variants', + $ENV{'form.numtoanalyze'}); + for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) { + &Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state, + 'last problem'); + my $subresult=&Apache::lonnet::ssi($request->uri, + ('grade_target' => 'analyze'), + ('rndseed' => $i)); + &Apache::lonxml::debug(":$subresult:"); + (my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2); + my %analyze=&Apache::lonnet::str2hash($subresult); + my @parts; + if (defined(@{ $analyze{'parts'} })) { + @parts=@{ $analyze{'parts'} }; + } + foreach my $part (@parts) { + if (!exists($allparts{$part})) {$allparts{$part}=1;}; + if ($analyze{$part.'.type'} eq 'numericalresponse' || + $analyze{$part.'.type'} eq 'stringresponse' || + $analyze{$part.'.type'} eq 'formularesponse' ) { + push( @{ $overall{$part.'.answer'} }, + [@{ $analyze{$part.'.answer'} }]); } - #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); } } - 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"); - $default=''; - } - $result = &Apache::lonxml::xmlparse($target, $problem, - $default.&setup_vars($target), - %mystyle); - #$request->print("Result follows:"); - if ($target eq 'modified') { - &handle_save_or_undo($request,\$problem,\$result); + } + &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state, + 'Analyzing Results'); + foreach my $part (keys(%allparts)) { + if (defined(@{ $overall{$part.'.answer'} })) { + $request->print(''); + foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) { + $request->print(''); + } + $request->print('
Part '.$part.'
'.join('',@{ $answer }). + '
'); } else { - #my $td=&tv_interval($t0); - #if ( $Apache::lonxml::debug) { - #$result =~ s:::; - #$result.="
Spent $td seconds processing target $target\n"; - #} - $request->print($result); - } - #$request->print(":Result ends"); - if ($target eq 'grade') { &showhash(%Apache::lonhomework::results); } - - #store new values - my ($temp) = keys %Apache::lonhomework::results; - if ( $temp ne '' ) { - &Apache::lonxml::debug("Store return message:". - &Apache::lonnet::cstore(\%Apache::lonhomework::results)); + $request->print('

Part '.$part. + ' is not analyzabale at this time

'); } - #my $td=&tv_interval($t0); } + &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state); + &analyze_footer($request); + &Apache::lonhomework::showhash(%overall); + return $result; +} + +sub editxmlmode { + my ($request,$file) = @_; + my $result; + my $problem=&Apache::lonnet::getfile($file); + if ($problem eq -1) { + &Apache::lonxml::error(" Unable to find $file"); + $problem=''; + } + if (defined($ENV{'form.editxmltext'}) || defined($ENV{'form.Undo'})) { + my $error=&handle_save_or_undo($request,\$problem, + \$ENV{'form.editxmltext'}); + if (!$error) { $problem=&Apache::lonnet::getfile($file); } + } + &Apache::lonhomework::showhashsubset(\%ENV,'^form'); + if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) { + &Apache::lonhomework::showhashsubset(\%ENV,'^form'); + $ENV{'form.problemmode'}='View'; + &renderpage($request,$file); + } else { + my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem); + my $xml_help = '
'. + &Apache::loncommon::help_open_topic("Problem_Editor_XML_Index",'Problem Editing Help') + .''. + &Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols', + undef,undef,600) + .''. + &Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols', + undef,undef,600) + .'
'; + if ($cols > 80) { $cols = 80; } + if ($cols < 70) { $cols = 70; } + if ($rows < 20) { $rows = 20; } + $result.=' +
+ + + +
+ + + +
+ ' . $xml_help . ' + +
'; + $request->print($result); + } + return ''; +} + +sub renderpage { + my ($request,$file) = @_; + + my (@targets) = &get_target(); + &Apache::lonxml::debug("Running targets ".join(':',@targets)); + foreach my $target (@targets) { + #my $t0 = [&gettimeofday()]; + my $problem=&Apache::lonnet::getfile($file); + if ($problem eq -1) { + &Apache::lonxml::error(" Unable to find $file"); + $problem=''; + } + + my %mystyle; + my $result = ''; + if ($target eq 'analyze') { %Apache::lonhomework::analyze=(); } + if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); } + if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');} + + &Apache::lonxml::debug("Should be parsing now"); + $result = &Apache::lonxml::xmlparse($request, $target, $problem, + &setup_vars($target),%mystyle); + undef($Apache::lonhomework::parsing_a_problem); + #$request->print("Result follows:"); + if ($target eq 'modified') { + &handle_save_or_undo($request,\$problem,\$result); + } else { + if ($target eq 'analyze') { + $result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze); + undef(%Apache::lonhomework::analyze); + } + #my $td=&tv_interval($t0); + #if ( $Apache::lonxml::debug) { + #$result =~ s:::; + #$result.="
Spent $td seconds processing target $target\n"; + #} + $request->print($result); + $request->rflush(); + } + #$request->print(":Result ends"); + #my $td=&tv_interval($t0); + } } -# =========================================================== Get template list # with no arg it returns a HTML "; - } + my ($namewanted,$extension) = @_; + my $result; + my @allnames; + &Apache::lonxml::debug("Looking for :$extension:"); + foreach my $file () { + my $name=&Apache::lonnet::metadata($file,'title'); + if ($namewanted && ($name eq $namewanted)) { + $result=$file; + last; + } else { + if ($name) { push (@allnames, $name); } } - return $result; + } + if (@allnames && !$result) { + $result="\n'; + } + return $result; } -# ================================================================= New problem sub newproblem { my ($request) = @_; - my $extension = $request->uri; - $extension =~ s:^.*\.([\w]+)$:$1:; + my $extension=$request->uri; + $extension=~s:^.*\.([\w]+)$:$1:; &Apache::lonxml::debug("Looking for :$extension:"); - if ($ENV{'form.template'}) { + if ($ENV{'form.template'} && + $ENV{'form.template'} ne "Select a $extension type") { use File::Copy; my $file = &get_template_list($ENV{'form.template'},$extension); my $dest = &Apache::lonnet::filelocation("",$request->uri); copy($file,$dest); - &renderpage($request,$file); + &renderpage($request,$dest); + } elsif($ENV{'form.newfile'}) { + # I don't like hard-coded filenames but for now, this will work. + use File::Copy; + my $templatefilename = + $request->dir_config('lonIncludes').'/templates/blank.problem'; + &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 $templatelist=&get_template_list('',$extension); + my $url=$request->uri; my $dest = &Apache::lonnet::filelocation("",$request->uri); + my $instructions; + if ($templatelist) { $instructions=", select a template from the pull-down menu below.
Then";} $request->print(< -The request file $url doesn\'t exist. You can create a new $extension
-
-
- -
- +

Creating a new $extension resource

+The requested file $url currently does not exist. +

+To create a new $extension$instructions click on the "Create $extension" button. +

+

ENDNEWPROBLEM - } - - return ''; + if (defined($templatelist)) { + $request->print(""); + } + $request->print("
"); + $request->print("

"); + } + return ''; } sub view_or_edit_menu { - my ($request) = @_; - my $url = $request->uri; - $request->print(<uri; + $request->print(<
Would you like to or @@ -367,61 +602,81 @@ Would you like to uri; + $ENV{'request.uri'}=$request->uri; #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; - } + $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:"); + # some times multiple problemmodes are submitted, need to select + # the last one + &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'}); + if ( defined($ENV{'form.problemmode'}) && + ref($ENV{'form.problemmode'}) ) { + &Apache::lonxml::debug("Problem Mode ".join(",",@$ENV{'form.problemmode'})); + my $mode=$ENV{'form.problemmode'}->[-1]; + undef $ENV{'form.problemmode'}; + $ENV{'form.problemmode'}=$mode; + } + &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'}); + 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.problemmode'})) { - #first visit to problem in construction space - &view_or_edit_menu($request); - #&renderpage($request,$file); - } else { - &renderpage($request,$file); + my ($symb) = &Apache::lonxml::whichuser(); + &Apache::lonxml::debug('symb is '.$symb); + if ($ENV{'request.state'} eq "construct" || $symb eq '') { + if ($ENV{'form.resetdata'} eq 'Reset Submissions' || + $ENV{'form.resetdata'} eq 'New Problem Variation' ) { + my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); + &Apache::lonnet::tmpreset($symb,'',$domain,$name); } - } else { - # requested file doesn't exist in contruction space - &newproblem($request); - } - } else { - # just render the page normally outside of construction space + } + if ($ENV{'request.state'} eq "construct") { + if ( -e $file ) { + if (!(defined $ENV{'form.problemmode'})) { + #first visit to problem in construction space + #&view_or_edit_menu($request); + $ENV{'form.problemmode'}='View'; + &renderpage($request,$file); + } elsif ($ENV{'form.problemmode'} eq 'EditXML') { + &editxmlmode($request,$file); + } elsif ($ENV{'form.problemmode'} eq 'Answer Distribution') { + &analyze($request,$file); + } else { &renderpage($request,$file); + } + } else { + # requested file doesn't exist in contruction space + &newproblem($request); } - #my $td=&tv_interval($t0); - #&Apache::lonxml::debug("Spent $td seconds processing"); - # &Apache::lonhomework::send_footer($request); - # always turn off debug messages - $Apache::lonxml::debug=0; - return OK; + } else { + # just render the page normally outside of construction space + &Apache::lonxml::debug("not construct"); + &renderpage($request,$file); + } + #my $td=&tv_interval($t0); + #&Apache::lonxml::debug("Spent $td seconds processing"); + # &Apache::lonhomework::send_footer($request); + # always turn off debug messages + $Apache::lonxml::debug=0; + return OK; + } 1; - __END__