Diff for /loncom/homework/lonhomework.pm between versions 1.63 and 1.141

version 1.63, 2001/11/29 18:36:59 version 1.141, 2003/09/15 18:43:53
Line 28 Line 28
 # Guy Albertelli  # Guy Albertelli
 # 11/30 Gerd Kortemeyer  # 11/30 Gerd Kortemeyer
 # 6/1,8/17,8/18 Gerd Kortemeyer  # 6/1,8/17,8/18 Gerd Kortemeyer
   # 7/18 Jeremy Bowers
   
 package Apache::lonhomework;  package Apache::lonhomework;
 use strict;  use strict;
 use Apache::style;  use Apache::style();
 use Apache::lonxml;  use Apache::lonxml();
 use Apache::lonnet;  use Apache::lonnet();
 use Apache::inputtags;  use Apache::lonplot();
 use Apache::structuretags;  use Apache::inputtags();
 use Apache::randomlabel;  use Apache::structuretags();
 use Apache::response;  use Apache::randomlabel();
 use Apache::hint;  use Apache::response();
 use Apache::outputtags;  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 Apache::Constants qw(:common);
   use HTML::Entities();
   use Apache::loncommon();
 #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.submitted'})) {        ($ENV{'request.state'} eq "uploaded")) {
       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'});
       } elsif (defined($ENV{'form.grade_target'}  ) 
    && ($ENV{'form.grade_target'} eq 'answer')) {
         return ($ENV{'form.grade_target'});
       }
    
       if ( defined($ENV{'form.submitted'}) &&
    ( !defined($ENV{'form.resetdata'})) &&
    ( !defined($ENV{'form.newrandomization'}))) {
       return ('grade', 'web');        return ('grade', 'web');
     } else {      } else {
       return ('web');        return ('web');
     }      }
   } elsif ($ENV{'request.state'} eq "construct") {    } 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.preview'})) {
       if ( defined($ENV{'form.submitted'})) {        if ( defined($ENV{'form.submitted'})) {
  return ('grade', 'web');   return ('grade', 'web');
Line 62  sub get_target { Line 92  sub get_target {
  return ('web');   return ('web');
       }        }
     } else {      } else {
       if ( $ENV{'form.problemmode'} eq 'View' ) {        if ( $ENV{'form.problemmode'} eq 'View' ||
      $ENV{'form.problemmode'} eq 'Discard Edits and View') {
  if ( defined($ENV{'form.submitted'}) &&   if ( defined($ENV{'form.submitted'}) &&
      (!defined($ENV{'form.resetdata'})) ) {       (!defined($ENV{'form.resetdata'})) &&
        (!defined($ENV{'form.newrandomization'}))) {
   return ('grade', 'web','answer');    return ('grade', 'web','answer');
  } else {   } else {
   return ('web','answer');    return ('web','answer');
  }   }
       } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {        } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
  if ( $ENV{'form.submitted'} eq 'edit' ) {   if ( $ENV{'form.submitted'} eq 'edit' ) {
   return ('modified','edit');    if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) {
       return ('modified','web','answer');
     } else {
       return ('modified','edit');
     }
  } else {   } else {
   return ('edit');    return ('edit');
  }   }
Line 113  sub send_footer { Line 149  sub send_footer {
   
 $Apache::lonxml::browse='';  $Apache::lonxml::browse='';
   
   # JB, 9/24/2002: Any changes in this function may require a change
   # in lonnavmaps::resource::getDateStatus.
 sub check_access {  sub check_access {
   my ($id) = @_;    my ($id) = @_;
   my $date ='';    my $date ='';
   my $status = '';    my $status;
   my $datemsg = '';    my $datemsg = '';
   my $lastdate = '';    my $lastdate = '';
   my $temp;    my $temp;
   my $type;    my $type;
   my $passed;    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("checking for part :$id:");
     &Apache::lonxml::debug("time:".time);
   foreach $temp ("opendate","duedate","answerdate") {    foreach $temp ("opendate","duedate","answerdate") {
     $lastdate = $date;      $lastdate = $date;
     $date = &Apache::lonnet::EXT("resource.$id.$temp");      $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:");      &Apache::lonxml::debug("found :$date: for :$temp:");
     if ($date eq '') {      if ($date eq '') {
       $date = "an unknown date"; $passed = 0;        $date = "an unknown date"; $passed = 0;
Line 152  sub check_access { Line 214  sub check_access {
     $datemsg = "was due on $lastdate, and answers will be available on $date";      $datemsg = "was due on $lastdate, and answers will be available on $date";
   }    }
   if ($status eq 'CAN_ANSWER') {    if ($status eq 'CAN_ANSWER') {
     #check #tries      #check #tries, and if correct.
     my $tries = $Apache::lonhomework::history{"resource.$id.tries"};      my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
     my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");      my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
     if ( $tries eq '' ) { $tries = '0'; }      if ( $tries eq '' ) { $tries = '0'; }
     if ( $maxtries eq '' ) { $maxtries = '2'; }       if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }       if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
       # if (correct and show prob status) or excused then CANNOT_ANSWER
       if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
    &&
    lc($Apache::lonhomework::problemstatus) ne 'no')
          ||
          $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {
    $status = 'CANNOT_ANSWER';
       }
   }    }
   
   if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&    #if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
       (!$Apache::lonhomework::history{"resource.0.outtoken"})) {    #    (!$Apache::lonhomework::history{"resource.0.outtoken"})) {
       return ('UNCHECKEDOUT','needs to be checked out');    #    return ('UNCHECKEDOUT','needs to be checked out');
   }    #}
   
   
   &Apache::lonxml::debug("sending back :$status:$datemsg:");    &Apache::lonxml::debug("sending back :$status:$datemsg:");
Line 172  sub check_access { Line 242  sub check_access {
     $status='CAN_ANSWER';      $status='CAN_ANSWER';
     $datemsg='is closed but you are allowed to view it';      $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';  
   }  
   return ($status,$datemsg);    return ($status,$datemsg);
 }  }
   
 sub showhash {  sub showhash {
   my (%hash) = @_;    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,"
    }
       }
       chop($string);
       $string.=")";
       return $string;
   }
   
   sub showhashsubset {
     my ($hash,$keyre) = @_;
   my $resultkey;    my $resultkey;
   foreach $resultkey (sort keys %hash) {    foreach $resultkey (sort keys %$hash) {
     &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");      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<br />restored values^</br>\n");    &Apache::lonxml::debug("\n<br />restored values^</br>\n");
   return '';    return '';
Line 192  sub showhash { Line 295  sub showhash {
   
 sub setuppermissions {  sub setuppermissions {
   $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});    $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
   $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});    my $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
     if (! $viewgrades && 
         exists($ENV{'request.course.sec'}) && 
         $ENV{'request.course.sec'} !~ /^\s*$/) {
         $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}.
                                                  '/'.$ENV{'request.course.sec'});
     }
     $Apache::lonhomework::viewgrades = $viewgrades;
   return ''    return ''
 }  }
   
 sub setupheader {  sub setupheader {
   my $request=$_[0];      my $request=$_[0];
   if ($ENV{'browser.mathml'}) {      if ($ENV{'browser.mathml'}) {
     $request->content_type('text/xml');   $request->content_type('text/xml');
   } else {      } else {
     $request->content_type('text/html');   $request->content_type('text/html');
   }      }
   &Apache::loncommon::no_cache($request);      $request->content_encoding('UTF-8');
   $request->send_http_header;      if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {
   return OK if $request->header_only;   &Apache::loncommon::no_cache($request);
   return ''      }
       $request->send_http_header;
       return OK if $request->header_only;
       return ''
 }  }
   
 sub handle_save_or_undo {  sub handle_save_or_undo {
   my ($request,$problem,$result) = @_;    my ($request,$problem,$result) = @_;
   my $fileout = &Apache::lonnet::filelocation("",$request->uri);    my $file    = &Apache::lonnet::filelocation("",$request->uri);
   my $filesave=$fileout.".bak";    my $filebak =$file.".bak";
     my $filetmp =$file.".tmp";
     my $error=0;
   
   if ($ENV{'form.Undo'} eq 'undo') {    if ($ENV{'form.Undo'} eq 'undo') {
     if (copy($filesave,$fileout)) {      my $error=0;
       $request->print("<b>Undid changes, Copied $filesave to $fileout<br /></b>");      if (!copy($file,$filetmp)) { $error=1; }
       if ((!$error) && (!copy($filebak,$file))) { $error=1; }
       if ((!$error) && (!move($filetmp,$filebak))) { $error=1; }
       if (!$error) {
         $request->print("<p><b>Undid changes, Switched $filebak and $file</b></p>");
     } else {      } else {
       $request->print("<font color=\"red\" size=\"+1\"><b>Unable to undo, unable to copy $filesave to $fileout<br /></b></font>");        $request->print("<p><font color=\"red\" size=\"+1\"><b>Unable to undo, unable to switch $filebak and $file</b></font></p>");
         $error=1;
     }      }
   } else {    } else {
     my $fs=Apache::File->new(">$filesave");      my $fs=Apache::File->new(">$filebak");
     if (defined($fs)) {      if (defined($fs)) {
       print $fs $$problem;        print $fs $$problem;
       $request->print("<b>Making Backup to $filesave</b><br />");        $request->print("<b>Making Backup to $filebak</b><br />");
     } else {      } else {
       $request->print("<font color=\"red\" size=\"+1\"><b>Unable to make backup $filesave</b></font>");        $request->print("<font color=\"red\" size=\"+1\"><b>Unable to make backup $filebak</b></font>");
         $error=2;
     }      }
     my $fh=Apache::File->new(">$fileout");      my $fh=Apache::File->new(">$file");
     if (defined($fh)) {      if (defined($fh)) {
       print $fh $$result;        print $fh $$result;
       $request->print("<b>Saving Modifications to $fileout</b><br />");        $request->print("<b>Saving Modifications to $file</b><br />");
     } else {      } else {
       $request->print("<font color=\"red\" size=\"+1\"><b>Unable to write to $fileout</b></font>");        $request->print("<font color=\"red\" size=\"+1\"><b>Unable to write to $file</b></font>");
         $error|=4;
       }
     }
     return $error;
   }
   
   sub analyze_header {
       my ($request) = @_;
       my $result.='<html>
               <head><title>Analyzing a problem</title></head>
               <body bgcolor="#FFFFFF">
               <form name="lonhomework" method="POST" action="'.
         $ENV{'request.uri'}.'">
               <input type="submit" name="problemmode" value="EditXML" />
               <input type="submit" name="problemmode" value="Edit" />
               <hr />
               <input type="submit" name="submit" value="View" />
               <hr />
               List of possible answers:
               </form>';
       $request->print($result);
       $request->rflush();
   }
   
   sub analyze_footer {
       my ($request) = @_;
       my $result='</body></html>';
       $request->print($result);
       $request->rflush();
   }
   
   sub analyze {
       my ($request,$file) = @_;
       &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+$rndseed));
    (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'} }]);
       }
    }
       }
       &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,
     'Analyzing Results');
       foreach my $part (sort(keys(%allparts))) {
    if (defined(@{ $overall{$part.'.answer'} })) {
       my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] });
       $request->print('<table><tr><td colspan="'.($num_cols+1).'">Part '.$part.'</td></tr>');
       my %frequency;
       foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {
    $frequency{join("\0",@{ $answer })}++;
       }
       $request->print('<tr><td colspan="'.($num_cols).'">Answer</td><td>Frequency</td></tr>');
       foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) {
    $request->print('<tr><td align="right">'.
    join('</td><td align="right">',split("\0",$answer)).
    '</td><td>('.$frequency{$answer}.
    ')</td></tr>');
       }
       $request->print('</table>');
    } else {
       $request->print('<p>Part '.$part.
       ' is not analyzable at this time</p>');
    }
     }      }
       if (scalar(keys(%allparts)) == 0 ) {
    $request->print('<p>Found no analyzable parts in this problem,
                            currently only Numerical, Formula and String response
                            styles are supported.</p>');
       }
       &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("<b> Unable to find <i>$file</i></b>");
       $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::helpLatexCheatsheet("Problem_Editor_XML_Index",
     "Problem Editing Help");
       if ($cols > 80) { $cols = 80; }
       if ($cols < 70) { $cols = 70; }
       if ($rows < 20) { $rows = 20; }
       $result.='<html><body bgcolor="#FFFFFF">
               <form name="lonhomework" method="POST" action="'.
         $ENV{'request.uri'}.'">
               <input type="hidden" name="problemmode" value="EditXML" />
               <input type="submit" name="problemmode" value="Discard Edits and View" />
               <input type="submit" name="problemmode" value="Edit" />
               <hr />
               <input type="submit" name="submit" value="Submit Changes" />
               <input type="submit" name="submit" value="Submit Changes and View" />
               <input type="submit" name="Undo" value="undo" />
               <hr />
               ' . $xml_help . '
               <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
         &HTML::Entities::encode($problem).'</textarea>
               </form></body></html>';
       $request->print($result);
   }    }
     return '';
 }  }
   
 sub renderpage {  sub renderpage {
   my ($request,$file) = @_;    my ($request,$file) = @_;
   
   my (@targets) = &get_target();    my (@targets) = &get_target();
     &Apache::lonxml::debug("Running targets ".join(':',@targets));
   foreach my $target (@targets) {    foreach my $target (@targets) {
     #my $t0 = [&gettimeofday()];      #my $t0 = [&gettimeofday()];
     my $problem=&Apache::lonnet::getfile($file);      my $problem=&Apache::lonnet::getfile($file);
     if ($problem == -1) {      if ($problem eq -1) {
       &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");        &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");
       $problem='';        $problem='';
     }      }
   
     my %mystyle;      my %mystyle;
     my $result = '';      my $result = '';
     &Apache::inputtags::initialize_inputtags;      if ($target eq 'analyze') { %Apache::lonhomework::analyze=(); }
     &Apache::edit::initialize_edit;      if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }
     if ($target eq 'web') {      if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');}
       if (&Apache::lonnet::symbread() eq '') {  
  if ($ENV{'request.state'} eq "construct") {      &Apache::lonxml::debug("Should be parsing now");
  } else {      $result = &Apache::lonxml::xmlparse($request, $target, $problem,
   $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");   &setup_vars($target),%mystyle);
  }      undef($Apache::lonhomework::parsing_a_problem);
       }  
       #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("<b>Unable to find <i>default_homework.lcpm</i></b>");  
       $default='';  
     }  
     $result = &Apache::lonxml::xmlparse($target, $problem,  
  $default.&setup_vars($target),%mystyle);  
   
     #$request->print("Result follows:");      #$request->print("Result follows:");
     if ($target eq 'modified') {      if ($target eq 'modified') {
       &handle_save_or_undo($request,\$problem,\$result);        &handle_save_or_undo($request,\$problem,\$result);
     } else {      } else {
         if ($target eq 'analyze') {
    $result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze);
    undef(%Apache::lonhomework::analyze);
         }
       #my $td=&tv_interval($t0);        #my $td=&tv_interval($t0);
       #if ( $Apache::lonxml::debug) {        #if ( $Apache::lonxml::debug) {
  #$result =~ s:</body>::;   #$result =~ s:</body>::;
  #$result.="<br />Spent $td seconds processing target $target\n</body>";   #$result.="<br />Spent $td seconds processing target $target\n</body>";
       #}        #}
       $request->print($result);        $request->print($result);
         $request->rflush();
     }      }
     #$request->print(":Result ends");      #$request->print(":Result ends");
     #my $td=&tv_interval($t0);      #my $td=&tv_interval($t0);
Line 294  sub renderpage { Line 548  sub renderpage {
 sub get_template_list {  sub get_template_list {
   my ($namewanted,$extension) = @_;    my ($namewanted,$extension) = @_;
   my $result;    my $result;
     my @allnames;
   &Apache::lonxml::debug("Looking for :$extension:");    &Apache::lonxml::debug("Looking for :$extension:");
   foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {    foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {
     my $name=&Apache::lonnet::metadata($file,'title');      my $name=&Apache::lonnet::metadata($file,'title');
Line 301  sub get_template_list { Line 556  sub get_template_list {
       $result=$file;        $result=$file;
       last;        last;
     } else {      } else {
       $result.="<option>$name</option>";   if ($name) { push (@allnames, $name); }
     }      }
   }    }
     if (@allnames && !$result) {
       $result="<option>Select a $extension template</option>\n<option>".
    join('</option><option>',sort(@allnames)).'</option>';
     }
   return $result;    return $result;
 }  }
   
 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'}) {  
     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);  
   } else {  
     my $templatelist=&get_template_list('',$extension);      my $templatelist=&get_template_list('',$extension);
     my $url=$request->uri;      if ($ENV{'form.template'} &&
     my $dest = &Apache::lonnet::filelocation("",$request->uri);   $ENV{'form.template'} ne "Select a $extension template") {
     $request->print(<<ENDNEWPROBLEM);   use File::Copy;
    my $file = &get_template_list($ENV{'form.template'},$extension);
    my $dest = &Apache::lonnet::filelocation("",$request->uri);
    copy($file,$dest);
    &renderpage($request,$dest);
       } elsif($ENV{'form.newfile'} && !$templatelist) {
    # 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 $url=$request->uri;
    my $dest = &Apache::lonnet::filelocation("",$request->uri);
    my $errormsg;
    if ($ENV{'form.newfile'}) {
       $errormsg='<p><font color="red">You did not select a template.</font></p>'."\n";
    }
    my $instructions;
    if ($templatelist) { $instructions=", select a template from the pull-down menu below.<br />Then";}
    $request->print(<<ENDNEWPROBLEM);
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF">
 The request file $url doesn\'t exist. You can create a new $extension <br />  <h1>Creating a new $extension resource</h1>
 <form action="$url" method="POST">  $errormsg
 <input type="submit" value="New $extension"><br />  The requested file <tt>$url</tt> currently does not exist.
 <select name="template">  <p>
 $templatelist  <b>To create a new $extension$instructions click on the "Create $extension" button.</b>
 </select>  </p>
 </form>  <p><form action="$url" method="POST">
 </body>  
 ENDNEWPROBLEM  ENDNEWPROBLEM
   }   if (defined($templatelist)) {
       $request->print("<select name=\"template\">$templatelist</select>");
   return '';   }
    $request->print("<br /><input type=\"submit\" name=\"newfile\" value=\"Create $extension\" />");
    $request->print("</form></p></body>");
       }
       return '';
 }  }
   
 sub view_or_edit_menu {  sub view_or_edit_menu {
Line 356  sub handler { Line 633  sub handler {
   #my $t0 = [&gettimeofday()];    #my $t0 = [&gettimeofday()];
   my $request=$_[0];    my $request=$_[0];
   
   if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}    $Apache::lonxml::debug=$ENV{'user.debug'};
   
   if (&setupheader($request)) { return OK; }    if (&setupheader($request)) { return OK; }
   $ENV{'request.uri'}=$request->uri;    $ENV{'request.uri'}=$request->uri;
Line 365  sub handler { Line 642  sub handler {
   $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});    $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
   $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});    $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
   &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");    &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);    my $file=&Apache::lonnet::filelocation("",$request->uri);
   
   #check if we know where we are    #check if we know where we are
Line 373  sub handler { Line 660  sub handler {
     # if we are browsing we might not be able to know where we are      # if we are browsing we might not be able to know where we are
     if ($Apache::lonhomework::browse ne 'F') {      if ($Apache::lonhomework::browse ne 'F') {
       #should know where we are, so ask        #should know where we are, so ask
       $request->internal_redirect('/adm/ambiguous'); return;  
       &Apache::lonnet::cleanenv();
   
    $request->internal_redirect('/adm/ambiguous'); return;
     }      }
   }    }
   
     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' ||
             $ENV{'form.newrandomization'} eq 'New Randomization') {
     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
     &Apache::lonnet::tmpreset($symb,'',$domain,$name);
   &Apache::lonxml::debug("Attempt reset");
         }
     }
   if ($ENV{'request.state'} eq "construct") {    if ($ENV{'request.state'} eq "construct") {
     if ($ENV{'form.resetdata'} eq 'Reset Submissions') {  
       my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();  
       &Apache::lonnet::tmpreset($symb,'',$domain,$name);  
     }  
     if ( -e $file ) {      if ( -e $file ) {
         &Apache::loncommon::get_unprocessed_cgi
                             ($ENV{'QUERY_STRING'},['problemmode']);
       if (!(defined $ENV{'form.problemmode'})) {        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);   $ENV{'form.problemmode'}='View';
    &renderpage($request,$file);
         } elsif ($ENV{'form.problemmode'} eq 'EditXML') {
    &editxmlmode($request,$file);
         } elsif ($ENV{'form.problemmode'} eq 'Calculate answers') {
    &analyze($request,$file);
       } else {        } else {
  &renderpage($request,$file);   &renderpage($request,$file);
       }        }
Line 396  sub handler { Line 700  sub handler {
     }      }
   } else {    } else {
     # just render the page normally outside of construction space      # just render the page normally outside of construction space
       &Apache::lonxml::debug("not construct");
     &renderpage($request,$file);      &renderpage($request,$file);
   }    }
   #my $td=&tv_interval($t0);    #my $td=&tv_interval($t0);

Removed from v.1.63  
changed lines
  Added in v.1.141


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