[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.79

version 1.74, 2002/03/29 18:32:46 version 1.79, 2002/05/24 18:55:23
Line 192  sub check_access { Line 192  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 334  sub renderpage { Line 342  sub renderpage {
     &Apache::edit::initialize_edit;      &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 'web') {
       if (&Apache::lonnet::symbread() eq '') {        my ($symb)=&Apache::lonxml::whichuser();
         if ($symb eq '') {
  if ($ENV{'request.state'} eq "construct") {   if ($ENV{'request.state'} eq "construct") {
  } else {   } else {
   $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");    $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");
Line 343  sub renderpage { Line 352  sub renderpage {
       #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }        #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
     }      }
     #if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); }      #if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); }
       #if ($target eq 'web') { &showhash(%ENV); }
   
     my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');      my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
     if ($default == -1) {      if ($default == -1) {
Line 350  sub renderpage { Line 360  sub renderpage {
       $default='';        $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);   $default.&setup_vars($target),%mystyle);
   
     #$request->print("Result follows:");      #$request->print("Result follows:");
Line 359  sub renderpage { Line 369  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 470  sub handler { Line 481  sub handler {
   # some times multiple problemmodes are submitted, need to select    # some times multiple problemmodes are submitted, need to select
   # the last one    # the last one
   if ( defined($ENV{'form.problemmode'}) &&    if ( defined($ENV{'form.problemmode'}) &&
        defined(@{ $ENV{'form.problemmode'} })) {         ref($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.79

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