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

Diff for /loncom/interface/groupsort.pm between versions 1.33 and 1.36

version 1.33, 2005/06/09 22:06:09 version 1.36, 2005/06/10 16:56:08
Line 180  sub readfromdb { Line 180  sub readfromdb {
     }      }
  }   }
     } else {      } else {
  $r->print('Unable to tie hash to db file</body></html>');   $r->print('Unable to tie hash to db file');
  return OK;  
     }      }
     untie %hash;      untie %hash;
     return ($shash,$thash);      return ($shash,$thash);
Line 198  sub cleanup { Line 197  sub cleanup {
     }      }
 }  }
   
   # -------------------------------------------------------------- Read from file
   
   sub readfromfile {
       my ($r,$shash,$thash,$nhash)=@_;
       my $cont=&Apache::lonnet::getfile
    (&Apache::lonnet::filelocation('',$env{'form.readfile'}));
       if ($cont==-1) {
    $r->print('Unable to read file: '.
     &Apache::lonnet::filelocation('',$env{'form.readfile'}));
       } else {
           my $parser = HTML::TokeParser->new(\$cont);
           my $token;
    my $n=1;
           while ($token = $parser->get_token) {
       if ($token->[0] eq 'S') {
                   if ($token->[1] eq 'resource') {
       if ($env{'form.recover'}) {
    if ($token->[2]->{'type'} ne 'zombie') { next; }
       } else {
    if ($token->[2]->{'type'} eq 'zombie') { next; }
       }
   
       my $url=$token->[2]->{'src'};
                       my $name=$token->[2]->{'title'};
       $name=~s/ \[\((\d+)\,(\w+)\,(\w+)\)\]$//;
       if ($1) {
    $$nhash{$url}='<br />'.&mt('Removed by ').
       &Apache::loncommon::plainname($2,$3).', '.
       &Apache::lonlocal::locallocaltime($1);
       }
       $$thash{$url}=$name;
                       $$shash{$url}=$n;
                       $n++;
    }
       }
    }
       }
       return ($shash,$thash);
   }
   
 # ---------------------------------------------------------------- Main Handler  # ---------------------------------------------------------------- Main Handler
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
     
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                            ['acts','catalogmode','mode']);                        ['acts','catalogmode','mode','readfile','recover']);
     # color scheme      # color scheme
     my $fileclr = '#ffffe6';      my $fileclr = '#ffffe6';
     my $titleclr = '#ddffff';      my $titleclr = '#ddffff';
Line 291  END Line 330  END
   
     my %shash; # sort order (key is resource location, value is sort order)      my %shash; # sort order (key is resource location, value is sort order)
     my %thash; # title (key is resource location, value is title)      my %thash; # title (key is resource location, value is title)
       my %nhash; # notes (key is resource location);
   
     &readfromdb($r,\%shash,\%thash);      if ($env{'form.readfile'}) {
    &readfromfile($r,\%shash,\%thash,\%nhash);
       } else {
    &readfromdb($r,\%shash,\%thash);
       }
   
     my $ctr = 0;      my $ctr = 0;
     my $clen = scalar(keys %shash);      my $clen = scalar(keys %shash);
Line 316  END Line 360  END
 <input type="hidden" name="oldval" value="" />  <input type="hidden" name="oldval" value="" />
 <input type="hidden" name="newval" value="" />  <input type="hidden" name="newval" value="" />
 <input type="hidden" name="mode" value="$env{'form.mode'}" />  <input type="hidden" name="mode" value="$env{'form.mode'}" />
   <input type="hidden" name="readfile" value="$env{'form.readfile'}" />
   <input type="hidden" name="recover" value="$env{'form.recover'}" />
 END  END
   
         # --- Expand here if "GO BACK" button desired          # --- Expand here if "GO BACK" button desired
Line 370  END Line 416  END
     $r->print("</td><td bgcolor='$fileclr'>");      $r->print("</td><td bgcolor='$fileclr'>");
     $r->print("<img src='$iconname' />");      $r->print("<img src='$iconname' />");
     $r->print("</td><td bgcolor='$fileclr'>");      $r->print("</td><td bgcolor='$fileclr'>");
     $r->print("$thash{$key}</td><td bgcolor='$fileclr'>\n");      $r->print("$thash{$key}$nhash{$key}</td><td bgcolor='$fileclr'>\n");
     $r->print("$key</td></tr>\n");      $r->print("$key</td></tr>\n");
  }    } 
     }      }
Line 426  sub select_box { Line 472  sub select_box {
     my $string;      my $string;
     $string = '<select name="alt'.$sel.'"';      $string = '<select name="alt'.$sel.'"';
     $string .= " onChange='selectchange($sel)'>";      $string .= " onChange='selectchange($sel)'>";
     $string .= "<option name='o0' value='0'>remove</option>";      $string .= "<option name='o0' value='0'>".&mt('discard')."</option>";
     for my $cur (1..$total) {      for my $cur (1..$total) {
  $string .= "<option name='o$cur' value='$cur'";   $string .= "<option name='o$cur' value='$cur'";
  if ($cur == $sel) {   if ($cur == $sel) {
Removed from v.1.33  
changed lines
  Added in v.1.36

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