[BACK]Return to lonhomework.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/lonhomework.pm between versions 1.74 and 1.100

version 1.74, 2002/03/29 18:32:46 version 1.100, 2002/11/10 15:39:37
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;
Line 41  use Apache::randomlabel(); Line 42  use Apache::randomlabel();
 use Apache::response();  use Apache::response();
 use Apache::hint();  use Apache::hint();
 use Apache::outputtags();  use Apache::outputtags();
   use Apache::caparesponse();
   use Apache::radiobuttonresponse();
   use Apache::optionresponse();
   use Apache::imageresponse();
   use Apache::essayresponse();
   use Apache::externalresponse();
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use HTML::Entities();  use HTML::Entities();
   use Apache::loncommon();
 #use Time::HiRes qw( gettimeofday tv_interval );  #use Time::HiRes qw( gettimeofday tv_interval );
   
 BEGIN {  BEGIN {
Line 51  BEGIN { Line 59  BEGIN {
   
 sub get_target {  sub get_target {
   if ( $ENV{'request.state'} eq "published") {    if ( $ENV{'request.state'} eq "published") {
     if ( defined($ENV{'form.grade_target'})       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 == 'F' )) {   && ($Apache::lonhomework::viewgrades == 'F' )) {
       return ($ENV{'form.grade_target'});        return ($ENV{'form.grade_target'});
     }      }
    
     if ( defined($ENV{'form.submitted'})) {      if ( defined($ENV{'form.submitted'})) {
       return ('grade', 'web');        return ('grade', 'web');
     } else {      } else {
Line 71  sub get_target { Line 83  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'})) ) {
   return ('grade', 'web','answer');    return ('grade', 'web','answer');
Line 80  sub get_target { Line 93  sub get_target {
  }   }
       } 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 122  sub send_footer { Line 139  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 ='';
Line 136  sub check_access { Line 155  sub check_access {
   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 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 192  sub check_access { Line 220  sub check_access {
   
 sub showhash {  sub showhash {
   my (%hash) = @_;    my (%hash) = @_;
     &showhashsubset(\%hash,'.');
     return '';
   }
   
   sub showhashsubset {
     my ($hash,$keyre) = @_;
   my $resultkey;    my $resultkey;
   foreach $resultkey (sort keys %hash) {    foreach $resultkey (sort keys %$hash) {
     if (ref($hash{$resultkey})) {      if ($resultkey =~ /$keyre/) {
       if ($hash{$resultkey} =~ /ARRAY/ ) {        if (ref($$hash{$resultkey})) {
  my $string="$resultkey ---- (";   if ($$hash{$resultkey} =~ /ARRAY/ ) {
  foreach my $elm (@{ $hash{$resultkey} }) {    my $string="$resultkey ---- (";
   $string.="$elm,";    foreach my $elm (@{ $$hash{$resultkey} }) {
       $string.="$elm,";
     }
     chop($string);
     &Apache::lonxml::debug("$string)");
    } else {
     &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
  }   }
  chop($string);  
  &Apache::lonxml::debug("$string)");  
       } else {        } else {
  &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");   &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");
Line 296  sub editxmlmode { Line 332  sub editxmlmode {
    \$ENV{'form.editxmltext'});     \$ENV{'form.editxmltext'});
     if (!$error) { $problem=&Apache::lonnet::getfile($file); }      if (!$error) { $problem=&Apache::lonnet::getfile($file); }
   }    }
   my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);    &Apache::lonhomework::showhashsubset(\%ENV,'^form');
   if ($cols > 80) { $cols = 80; }    if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) {
   $result.='<html><body bgcolor="#FFFFFF">      &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");
       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="'.              <form name="lonhomework" method="POST" action="'.
       $ENV{'request.uri'}.'">        $ENV{'request.uri'}.'">
             <input type="hidden" name="problemmode" value="EditXML" />              <input type="hidden" name="problemmode" value="EditXML" />
             <input type="submit" name="problemmode" value="View" />              <input type="submit" name="problemmode" value="Discard Edits and View" />
             <input type="submit" name="problemmode" value="Edit" />              <input type="submit" name="problemmode" value="Edit" />
             <hr />              <hr />
             <input type="submit" name="submit" value="Submit Changes" />              <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" />              <input type="submit" name="Undo" value="undo" />
             <hr />              <hr />
               ' . $xml_help . ' Problem Help<br>
             <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.              <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
       &HTML::Entities::encode($problem).'</textarea>        &HTML::Entities::encode($problem).'</textarea>
             </form></body></html>';              </form></body></html>';
   $request->print($result);      $request->print($result);
     }
   return '';    return '';
 }  }
   
Line 330  sub renderpage { Line 378  sub renderpage {
   
     my %mystyle;      my %mystyle;
     my $result = '';      my $result = '';
     &Apache::inputtags::initialize_inputtags;      &Apache::inputtags::initialize_inputtags();
     &Apache::edit::initialize_edit;      &Apache::outputtags::initialize_outputtags();
       &Apache::edit::initialize_edit();
     if ($target eq 'analyze') { %Apache::lonhomework::anaylze=(); }      if ($target eq 'analyze') { %Apache::lonhomework::anaylze=(); }
     if ($target eq 'web') {      if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }
       if (&Apache::lonnet::symbread() eq '') {      if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');}
  if ($ENV{'request.state'} eq "construct") {  
  } else {  
   $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");  
  }  
       }  
       #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='';  
     }  
     &Apache::lonxml::debug("Should be parsing now");      &Apache::lonxml::debug("Should be parsing now");
     $result = &Apache::lonxml::xmlparse($target, $problem,      $result = &Apache::lonxml::xmlparse($request, $target, $problem,
  $default.&setup_vars($target),%mystyle);   &setup_vars($target),%mystyle);
   
     #$request->print("Result follows:");      #$request->print("Result follows:");
     if ($target eq 'modified') {      if ($target eq 'modified') {
Line 359  sub renderpage { Line 395  sub renderpage {
     } else {      } else {
       if ($target eq 'analyze') {        if ($target eq 'analyze') {
  $result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::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) {
Line 377  sub renderpage { Line 414  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 384  sub get_template_list { Line 422  sub get_template_list {
       $result=$file;        $result=$file;
       last;        last;
     } else {      } else {
       $result.="<option>$name</option>";        push (@allnames, $name);
     }      }
   }    }
     if (@allnames && !$result) {
       $result="<option>Select a $extension type</option>\n<option>".
         join('</option><option>',sort(@allnames)).'</option>';
     }
   return $result;    return $result;
 }  }
   
Line 395  sub newproblem { Line 437  sub newproblem {
     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'}) {      if ($ENV{'form.template'} &&
    $ENV{'form.template'} ne "Select a $extension type") {
  use File::Copy;   use File::Copy;
  my $file = &get_template_list($ENV{'form.template'},$extension);   my $file = &get_template_list($ENV{'form.template'},$extension);
  my $dest = &Apache::lonnet::filelocation("",$request->uri);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
Line 410  sub newproblem { Line 453  sub newproblem {
  my $dest = &Apache::lonnet::filelocation("",$request->uri);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
  copy($templatefilename,$dest);   copy($templatefilename,$dest);
  &renderpage($request,$dest);   &renderpage($request,$dest);
     }else {      } else {
  my $templatelist=&get_template_list('',$extension);   my $templatelist=&get_template_list('',$extension);
  my $url=$request->uri;   my $url=$request->uri;
  my $dest = &Apache::lonnet::filelocation("",$request->uri);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
  if (!defined($templatelist)) {   my $instructions;
     # We didn't find a template, so just create a blank problem.   if ($templatelist) { $instructions=", select a template from the pull-down menu below. Then";}
     $request->print(<<ENDNEWPROBLEM);  
 <body bgcolor="#FFFFFF">  
 The requested file $url doesn\'t exist. You can create a new $extension <br />  
 <form action="$url" method="POST">  
 <input type="submit" name="newfile" value="New $extension"><br />  
 </form>  
 </body>  
 ENDNEWPROBLEM  
             return '';  
         }  
  $request->print(<<ENDNEWPROBLEM);   $request->print(<<ENDNEWPROBLEM);
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF">
 The requested file $url doesn\'t exist. You can create a new $extension <br />  The requested file $url doesn\'t exist. <br />
   To create a new $extension$instructions click on the Create $extension button.
 <form action="$url" method="POST">  <form action="$url" method="POST">
 <input type="submit" value="New $extension"><br />  
 <select name="template">  
 $templatelist  
 </select>  
 </form>  
 </body>  
 ENDNEWPROBLEM  ENDNEWPROBLEM
    if (defined($templatelist)) {
       $request->print("<select name=\"template\">$templatelist</select>");
    }
    $request->print("<br /><input type=\"submit\" name=\"newfile\" value=\"Create $extension\" />");
    $request->print("</form></body>");
     }      }
     return '';      return '';
 }  }
Line 458  sub handler { Line 491  sub handler {
   #my $t0 = [&gettimeofday()];    #my $t0 = [&gettimeofday()];
   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;}
     $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 469  sub handler { Line 503  sub handler {
   &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    # some times multiple problemmodes are submitted, need to select
   # the last one    # the last one
     &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});
   if ( defined($ENV{'form.problemmode'}) &&    if ( defined($ENV{'form.problemmode'}) &&
        defined(@{ $ENV{'form.problemmode'} })) {         ref($ENV{'form.problemmode'}) ) {
       &Apache::lonxml::debug("Problem Mode ".join(",",@$ENV{'form.problemmode'}));
     my $mode=$ENV{'form.problemmode'}->[-1];      my $mode=$ENV{'form.problemmode'}->[-1];
     undef $ENV{'form.problemmode'};      undef $ENV{'form.problemmode'};
     $ENV{'form.problemmode'}=$mode;      $ENV{'form.problemmode'}=$mode;
Removed from v.1.74  
changed lines
  Added in v.1.100

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