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

Diff for /loncom/interface/groupsort.pm between versions 1.34 and 1.39

version 1.34, 2005/06/10 02:19:51 version 1.39, 2006/02/07 19:46:30
Line 195  sub cleanup { Line 195  sub cleanup {
     &Apache::lonnet::logthis('Failed cleanup groupsort: hash');      &Apache::lonnet::logthis('Failed cleanup groupsort: hash');
         }          }
     }      }
       return OK;
 }  }
   
 # -------------------------------------------------------------- Read from file  # -------------------------------------------------------------- Read from file
   
 sub readfromfile {  sub readfromfile {
     my ($r,$shash,$thash)=@_;      my ($r,$shash,$thash,$nhash)=@_;
     my $cont=&Apache::lonnet::getfile      my $cont=&Apache::lonnet::getfile
  (&Apache::lonnet::filelocation('',$env{'form.readfile'}));   (&Apache::lonnet::filelocation('',$env{'form.readfile'}));
     if ($cont==-1) {      if ($cont==-1) {
Line 209  sub readfromfile { Line 210  sub readfromfile {
     } else {      } else {
         my $parser = HTML::TokeParser->new(\$cont);          my $parser = HTML::TokeParser->new(\$cont);
         my $token;          my $token;
    my $n=1;
         while ($token = $parser->get_token) {          while ($token = $parser->get_token) {
     if ($token->[0] eq 'S') {      if ($token->[0] eq 'S') {
                 if ($token->[1] eq 'resource') {                  if ($token->[1] eq 'resource') {
Line 217  sub readfromfile { Line 219  sub readfromfile {
     } else {      } else {
  if ($token->[2]->{'type'} eq 'zombie') { next; }   if ($token->[2]->{'type'} eq 'zombie') { next; }
     }      }
                     my $name=$token->[2]->{'title'};  
     my $url=$token->[2]->{'src'};      my $url=$token->[2]->{'src'};
                       my $name=$token->[2]->{'title'};
     $name=~s/ \[\((\d+)\,(\w+)\,(\w+)\)\]$//;      $name=~s/ \[\((\d+)\,(\w+)\,(\w+)\)\]$//;
     if ($1) {      if ($1) {
  $name.='<br />'.&mt('Removed by ').   $$nhash{$url}='<br />'.&mt('Removed by ').
     &Apache::loncommon::plainname($2,$3).', '.      &Apache::loncommon::plainname($2,$3).', '.
     &Apache::lonlocal::locallocaltime($1);      &Apache::lonlocal::locallocaltime($1);
     }      }
     $r->print('<br />'.$name);      $name=~s/\&colon\;/\:/g;
       $$thash{$url}=$name;
                       $$shash{$url}=$n;
                       $n++;
  }   }
     }      }
  }   }
Line 249  sub handler { Line 255  sub handler {
   
 # finish_import looks different for graphical or "simple" RAT  # finish_import looks different for graphical or "simple" RAT
     my $finishimport='';      my $finishimport='';
       my $begincondition='';
       my $endcondition='';
       if ($env{'form.readfile'}) {
           $begincondition='if (eval("document.forms.groupsort.include"+num+".checked")) {';
    $endcondition='}';
       }
     if ($env{'form.mode'} eq 'simple' || $env{'form.mode'} eq '') {      if ($env{'form.mode'} eq 'simple' || $env{'form.mode'} eq '') {
         $finishimport=(<<ENDSMP);          $finishimport=(<<ENDSMP);
 function finish_import() {  function finish_import() {
     opener.document.forms.simpleedit.importdetail.value='';      opener.document.forms.simpleedit.importdetail.value='';
     for (var num=0; num<document.forms.groupsort.fnum.value; num++) {      for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
    $begincondition
  opener.document.forms.simpleedit.importdetail.value+='&'+   opener.document.forms.simpleedit.importdetail.value+='&'+
               escape(eval("document.forms.groupsort.title"+num+".value"))+'='+                escape(eval("document.forms.groupsort.title"+num+".value"))+'='+
       escape(eval("document.forms.groupsort.filelink"+num+".value"));        escape(eval("document.forms.groupsort.filelink"+num+".value"));
    $endcondition
     }      }
     opener.document.forms.simpleedit.submit();      opener.document.forms.simpleedit.submit();
     self.close();      self.close();
Line 267  ENDSMP Line 281  ENDSMP
 function finish_import() {  function finish_import() {
     var linkflag=false;      var linkflag=false;
     for (var num=0; num<document.forms.groupsort.fnum.value; num++) {      for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
    $begincondition
  insertRowInLastRow();   insertRowInLastRow();
  placeResourceInLastRow(   placeResourceInLastRow(
        eval("document.forms.groupsort.title"+num+".value"),         eval("document.forms.groupsort.title"+num+".value"),
Line 274  function finish_import() { Line 289  function finish_import() {
        linkflag         linkflag
  );   );
         linkflag=true;          linkflag=true;
    $endcondition
     }      }
     opener.editmode=0;      opener.editmode=0;
     opener.notclear=0;      opener.notclear=0;
Line 326  END Line 342  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);
   
     if ($env{'form.readfile'}) {      if ($env{'form.readfile'}) {
  &readfromfile($r,\%shash,\%thash);   &readfromfile($r,\%shash,\%thash,\%nhash);
     } else {      } else {
  &readfromdb($r,\%shash,\%thash);   &readfromdb($r,\%shash,\%thash);
     }      }
   
     my $ctr = 0;      my $ctr = 0;
     my $clen = scalar(keys %shash);      my $clen = scalar(keys %shash);
     if ($clen > 1) {      if (($clen > 1) || ($env{'form.readfile'})) {
  my %lt=&Apache::lonlocal::texthash(   my %lt=&Apache::lonlocal::texthash(
  'fin'=> 'Finalize order of resources',   'fin'=> 'Finalize order of resources',
  'gb' => 'Go Back',   'gb' => 'Go Back',
Line 344  END Line 361  END
  'ca' => 'Cancel',   'ca' => 'Cancel',
  'co' => 'Change Order',   'co' => 'Change Order',
  'ti' => 'Title',   'ti' => 'Title',
  'pa' => 'Path'   'pa' => 'Path',
                   'in' => 'Include'
  );   );
  $r->print(&Apache::loncommon::bodytag('Sort Imported Resources'));   $r->print(&Apache::loncommon::bodytag('Sort Imported Resources'));
  $r->print(<<END);   $r->print(<<END);
Line 355  END Line 373  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 380  END Line 400  END
 END  END
         $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");          $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");
  $r->print("<table border=0><tr>\n");   $r->print("<table border=0><tr>\n");
  $r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'co'}</b></td>\n");   if ($env{'form.readfile'}) { 
       $r->print("<td bgcolor='$titleclr'><b>$lt{'in'}</b></td>\n");
    } else { 
       $r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'co'}</b></td>\n"); 
    }
  $r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'ti'}</b></td>\n");   $r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'ti'}</b></td>\n");
  $r->print("<td bgcolor='$titleclr'><b>$lt{'pa'}</b></td></tr>\n");   $r->print("<td bgcolor='$titleclr'><b>$lt{'pa'}</b></td></tr>\n");
     } else {      } else {
Line 398  END Line 422  END
  my $key=$_;   my $key=$_;
  $ctr++;   $ctr++;
  my $iconname=&Apache::loncommon::icon($key);   my $iconname=&Apache::loncommon::icon($key);
  if ($clen > 1) {   if (($clen > 1) || ($env{'form.readfile'})) {
     $r->print("<tr><td bgcolor='$fileclr'>");      $r->print("<tr><td bgcolor='$fileclr'>");
     $r->print(&movers($clen,$ctr));              if ($env{'form.readfile'}) {
    $r->print(&checkbox($ctr-1));
       } else {
    $r->print(&movers($clen,$ctr));
       }
  }   }
  $r->print(&hidden($ctr-1,$thash{$key},$key));   $r->print(&hidden($ctr-1,$thash{$key},$key));
  if ($clen > 1) {   if (($clen > 1)  || ($env{'form.readfile'})) {
     $r->print("</td><td bgcolor='$fileclr'>");      $r->print("</td>");
     $r->print(&select_box($clen,$ctr));              unless ($env{'form.readfile'}) {
     $r->print("</td><td bgcolor='$fileclr'>");   $r->print("<td bgcolor='$fileclr'>".
     &select_box($clen,$ctr).
     "</td>");
       }
       $r->print("<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");
  }    } 
     }      }
     if ($clen > 1) {      if (($clen > 1) || ($env{'form.readfile'})) {
  $r->print("</table></td></tr></table></form>");   $r->print("</table></td></tr></table></form>");
     } else {      } else {
  $r->print(<<END);   $r->print(<<END);
Line 465  sub select_box { Line 497  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) {
Line 477  sub select_box { Line 509  sub select_box {
     return $string;      return $string;
 }  }
   
   # ------------------------------------------------------------------- Checkbox
   
   sub checkbox {
       my $sel=shift;
       return "<label><input type='checkbox' name='include$sel'".
          ($env{"form.include$sel"}?' checked="checked"':'').
          ' />'.&mt('Include').'</label>';
   }
   
 1;  1;
   
 __END__  __END__
Removed from v.1.34  
changed lines
  Added in v.1.39

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