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

Diff for /loncom/interface/groupsort.pm between versions 1.41 and 1.63

version 1.41, 2006/03/26 19:44:45 version 1.63, 2008/12/01 19:12:37
Line 37  use GDBM_File; Line 37  use GDBM_File;
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use LONCAPA;
   
 my $iconpath; # variable to be accessible to multiple subroutines  my $iconpath; # variable to be accessible to multiple subroutines
 my %hash; # variable to tie to user specific database  my %hash; # variable to tie to user specific database
   
   
 sub readfromdb {  sub update_actions_hash {
     my ($r,$shash,$thash)=@_;      my ($hash) = @_;
       # be careful in here, there is also a global %hash
     my $diropendb;      my $acts=$env{'form.acts'};
 # ------------------------------ which file do we open? Easy if explictly given      my @Acts=split(/b/,$acts);
     if ($env{'form.catalogmode'} eq 'groupsearch') {      my %ahash;
  $diropendb =       my %achash;
     "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_searchcat.db";      # some initial hashes for working with data
     } elsif ($env{'form.catalogmode'} eq 'groupimport') {      my $ac=0;
  $diropendb =       foreach (@Acts) {
     "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_indexer.db";    my ($state,$ref)=split(/a/);
     } elsif ($env{'form.catalogmode'} eq 'groupsec') {   $ahash{$ref}=$state;
  $diropendb =    $achash{$ref}=$ac;
     "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_groupsec.db";   $ac++;
     } else {      }
 # --------------------- not explicitly given, choose the one most recently used      # sorting through the actions and changing the global database hash
         my @dbfn;      foreach my $key (sort {$achash{$a}<=>$achash{$b}} (keys %ahash)) {
         my @dbst;   if ($ahash{$key} eq '1') {
       $hash->{'store_'.$hash->{'pre_'.$key.'_link'}}=
  $dbfn[0] =   $hash->{'pre_'.$key.'_title'};
     "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_searchcat.db";      $hash->{'storectr_'.$hash->{'pre_'.$key.'_link'}}=
         $dbst[0]=-1;   $hash->{'storectr'}+0;
  if (-e $dbfn[0]) {      $hash->{'storectr'}++;
     $dbst[0]=(stat($dbfn[0]))[9];   }
  }   if ($ahash{$key} eq '0') {
  $dbfn[1] =      if ($hash->{'store_'.$hash->{'pre_'.$key.'_link'}}) {
             "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_indexer.db";   delete($hash->{'store_'.$hash->{'pre_'.$key.'_link'}});
         $dbst[1]=-1;   delete($hash->{'storectr_'.$hash->{'pre_'.$key.'_link'}});
  if (-e $dbfn[1]) {      }
             $dbst[1]=(stat($dbfn[1]))[9];   }
         }      }
  $dbfn[2] =      # deleting the previously cached listing
             "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_groupsec.db";      foreach my $key (keys(%{ $hash })) {
         $dbst[2]=-1;   next if ($key !~ /^pre_(\d+)_link/);
  if (-e $dbfn[2]) {   my $which = $1;
             $dbst[2]=(stat($dbfn[2]))[9];   delete($hash->{'pre_'.$which.'_title'});
         }   delete($hash->{'pre_'.$which.'_link'});
 # Expand here for more modes      }
 # ....  }
   
 # Okay, find most recent existing  sub readfromdb {
       my ($r,$resources)=@_;
   
         my $newest=0;      my $diropendb = 
         $diropendb='';         "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db";
         for (my $i=0; $i<=$#dbfn; $i++) {  
     if ($dbst[$i]>$newest) {  
  $newest=$dbst[$i];  
                 $diropendb=$dbfn[$i];  
             }  
         }  
   
     }  
 # ----------------------------- diropendb is now the filename of the db to open  # ----------------------------- diropendb is now the filename of the db to open
     if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {      if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
  my $acts = $env{'form.acts'};   &update_actions_hash(\%hash);
  my @Acts = split(/b/,$acts);  
  my %ahash;   my %temp_resources;
  my %achash;   foreach my $key (keys(%hash)) {
  my $ac = 0;      next if ($key !~ /^store_/);
  foreach (@Acts) {      my ($url) = ($key =~ /^store_(.*)/);
     my ($state,$ref) = split(/a/);      $temp_resources{$hash{'storectr_'.$url}}{'url'}=$url;
     $ahash{$ref} = $state;      $temp_resources{$hash{'storectr_'.$url}}{'title'}=
     $achash{$ref} = $ac;   &Apache::lonnet::gettitle($url);
     $ac++;  
  }  
  foreach (sort {$achash{$a} <=> $achash{$b}} (keys %ahash)) {  
     my $key = $_;  
     if ($ahash{$key} eq '1') {  
 # my $keyz=join("<br />",keys %hash);  
 # print "<br />$key<br />$keyz".$hash{'pre_'.$key.'_link'}."<br />\n";  
  $hash{'store_'.$hash{'pre_'.$key.'_link'}} =  
     $hash{'pre_'.$key.'_title'};  
  $hash{'storectr_'.$hash{'pre_'.$key.'_link'}} =  
     $hash{'storectr'}+0;  
  $hash{'storectr'}++;  
     }  
     if ($ahash{$key} eq '0') {  
  if ($hash{'store_'.$hash{'pre_'.$key.'_link'}}) {  
     delete $hash{'store_'.$hash{'pre_'.$key.'_link'}};  
  }  
     }  
  }   }
  foreach (keys %hash) {  
     if ($_ =~ /^store_/) {   # use the temp, since there might be gaps in the counting
  my $key = $_;   foreach my $item (sort {$a <=> $b} (keys(%temp_resources))) {
  $key =~ s/^store_//;      push(@{ $resources },$temp_resources{$item});
  $$shash{$key} = $hash{'storectr_'.$key};  
  if (&Apache::lonnet::gettitle($key) eq '') {  
     $$thash{$key} = $hash{'store_'.$key};  
  } else {  
     $$thash{$key} = &Apache::lonnet::gettitle($key);  
  }  
     }  
  }   }
   
  if ($env{'form.oldval'}) {   if ($env{'form.oldval'}) {
     my $newctr = 0;      my $res = splice(@{$resources},$env{'form.oldval'}-1,1);
     my %chash;      if ($env{'form.newval'} == 0) {
     foreach (sort {$$shash{$a} <=> $$shash{$b}} (keys %{$shash})) {   # picked 'discard'
  my $key = $_;   my $url =  $res->{'url'};
  $newctr++;   delete($hash{'storectr_'.$url});
  $$shash{$key} = $newctr;   delete($hash{'store_'.$url});
  $hash{'storectr_'.$key} = $newctr;      } else {
  $chash{$newctr} = $key;   splice(@{$resources},$env{'form.newval'}-1,0,$res);
     }  
     my $oldval = $env{'form.oldval'};  
     my $newval = $env{'form.newval'};  
     if ($oldval != $newval) {  
  # when newval==0, then push down and delete  
  if ($newval!=0) {  
     $$shash{$chash{$oldval}} = $newval;  
     $hash{'storectr_'.$chash{$oldval}} = $newval;  
  } else {  
     $$shash{$chash{$oldval}} = $newctr;  
     $hash{'storectr_'.$chash{$oldval}} = $newctr;  
  }  
  if ($newval==0) { # push down  
     my $newval2=$newctr;  
     for my $idx ($oldval..($newval2-1)) {  
  $$shash{$chash{$idx+1}} = $idx;  
  $hash{'storectr_'.$chash{$idx+1}} = $idx;  
     }  
     delete $$shash{$chash{$oldval}};  
     delete $hash{'storectr_'.$chash{$oldval}};  
     delete $hash{'store_'.$chash{$oldval}};  
  } elsif ($oldval < $newval) { # push down  
     for my $idx ($oldval..($newval-1)) {  
  $$shash{$chash{$idx+1}} = $idx;  
  $hash{'storectr_'.$chash{$idx+1}} = $idx;  
     }  
  } elsif ($oldval > $newval) { # push up  
     for my $idx (reverse($newval..($oldval-1))) {  
  $$shash{$chash{$idx}} = $idx+1;  
  $hash{'storectr_'.$chash{$idx}} = $idx+1;  
     }  
  }  
     }      }
  }   }
    # store out new order
    foreach my $which (0..$#$resources) {
       my $url =  $resources->[$which]{'url'};
       $hash{'storectr_'.$url} = $which;
    }
     } else {      } else {
  $r->print('Unable to tie hash to db file');   $r->print('Unable to tie hash to db file');
     }      }
     untie %hash;      untie(%hash);
     return ($shash,$thash);  
 }  }
   
   
Line 201  sub cleanup { Line 144  sub cleanup {
 # -------------------------------------------------------------- Read from file  # -------------------------------------------------------------- Read from file
   
 sub readfromfile {  sub readfromfile {
     my ($r,$shash,$thash,$nhash)=@_;      my ($r,$resources)=@_;
     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 210  sub readfromfile { Line 153  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 220  sub readfromfile { Line 162  sub readfromfile {
  if ($token->[2]->{'type'} eq 'zombie') { next; }   if ($token->[2]->{'type'} eq 'zombie') { next; }
     }      }
   
     my $url=$token->[2]->{'src'};  
                     my $name=$token->[2]->{'title'};                      my $name=$token->[2]->{'title'};
     $name=~s/ \[\((\d+)\,(\w+)\,(\w+)\)\]$//;      $name=~s/ \[\((\d+)\,($LONCAPA::username_re)\,($LONCAPA::domain_re)\)\]$//;
       my $note;
     if ($1) {      if ($1) {
  $$nhash{$url}='<br />'.&mt('Removed by ').   $note = '<br />'.&mt('Removed by ').
     &Apache::loncommon::plainname($2,$3).', '.      &Apache::loncommon::plainname($2,$3).', '.
     &Apache::lonlocal::locallocaltime($1);      &Apache::lonlocal::locallocaltime($1);
     }      }
     $name=~s/\&colon\;/\:/g;      $name=~s/\&colon\;/\:/g;
     $$thash{$url}=$name;      push(@{$resources}, {'url'   => $token->[2]->{'src'},
                     $$shash{$url}=$n;   'title' => $name,
                     $n++;   'note'  => $note,
            'id'    => $token->[2]->{'id'},});
  }   }
     }      }
  }   }
     }      }
     return ($shash,$thash);  }
   
   # --------------------------------------------------------- Read from bookmarks
   
   sub readfrombookmarks {
       my ($r,$resources)=@_;
       my %bookmarks=&Apache::lonnet::dump('bookmarks');
   # the bookmark "hash" is just one entry
   # it's a javascript program code with arguments like ('title','url');
       my @bookmarks=($bookmarks{'bookmarks'}=~/\((?:\'([^\']+)\'\,\'([^\']+)\'|\"([^\"]+)\"\,\"([^\"]+)\")\)\;/g);
       for (my $index=0;$index<($#bookmarks+1)/2;$index++) {
           if ($bookmarks[$index*2+1]) {
       my $url  = $bookmarks[$index*2+1];
       my $name = $bookmarks[$index*2];
       $name =~ s/^LON\-CAPA\s+//;
   
       push(@{$resources},{'url' => $url, 'title' => $name});
    }
       }
 }  }
   
 # ---------------------------------------------------------------- Main Handler  # ---------------------------------------------------------------- Main Handler
Line 244  sub handler { Line 205  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','readfile','recover']);       ['acts','mode','readfile','recover','bookmarks']);
     # color scheme  
     my $fileclr = '#ffffe6';  
     my $titleclr = '#ddffff';  
   
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
Line 257  sub handler { Line 215  sub handler {
     my $finishimport='';      my $finishimport='';
     my $begincondition='';      my $begincondition='';
     my $endcondition='';      my $endcondition='';
     if ($env{'form.readfile'}) {      if (($env{'form.readfile'}) || ($env{'form.bookmarks'}))  {
         $begincondition='if (eval("document.forms.groupsort.include"+num+".checked")) {';          $begincondition='if (eval("document.forms.groupsort.include"+num+".checked")) {';
  $endcondition='}';   $endcondition='}';
     }      }
Line 268  function finish_import() { Line 226  function finish_import() {
     for (var num=0; num<document.forms.groupsort.fnum.value; num++) {      for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
  $begincondition   $begincondition
  opener.document.forms.simpleedit.importdetail.value+='&'+   opener.document.forms.simpleedit.importdetail.value+='&'+
               escape(eval("document.forms.groupsort.title"+num+".value"))+'='+                eval("document.forms.groupsort.title"+num+".value")+'='+
       escape(eval("document.forms.groupsort.filelink"+num+".value"));        eval("document.forms.groupsort.filelink"+num+".value")+'='+
         eval("document.forms.groupsort.id"+num+".value");
  $endcondition   $endcondition
     }      }
     opener.document.forms.simpleedit.submit();      opener.document.forms.simpleedit.submit();
Line 286  function finish_import() { Line 245  function finish_import() {
  placeResourceInLastRow(   placeResourceInLastRow(
        eval("document.forms.groupsort.title"+num+".value"),         eval("document.forms.groupsort.title"+num+".value"),
         eval("document.forms.groupsort.filelink"+num+".value"),          eval("document.forms.groupsort.filelink"+num+".value"),
           eval("document.forms.groupsort.id"+num+".value"),
        linkflag         linkflag
  );   );
         linkflag=true;          linkflag=true;
Line 307  function insertRowInLastRow() { Line 267  function insertRowInLastRow() {
     opener.insertrow(opener.maxrow);      opener.insertrow(opener.maxrow);
     opener.addobj(opener.maxrow,'e&2');      opener.addobj(opener.maxrow,'e&2');
 }  }
 function placeResourceInLastRow (title,url,linkflag) {  function placeResourceInLastRow (title,url,id,linkflag) {
     opener.mostrecent=opener.newresource(opener.maxrow,2,opener.escape(title),      opener.mostrecent=opener.newresource(opener.maxrow,2,opener.escape(title),
        opener.escape(url),'false','normal');         opener.escape(url),'false','normal',id);
     opener.save();      opener.save();
     if (linkflag) {      if (linkflag) {
  opener.joinres(opener.linkmode,opener.mostrecent,0);   opener.joinres(opener.linkmode,opener.mostrecent,0);
Line 335  END Line 295  END
     my $domain  = $r->dir_config('lonDefDomain');      my $domain  = $r->dir_config('lonDefDomain');
     $iconpath = $r->dir_config('lonIconsURL') . "/";      $iconpath = $r->dir_config('lonIconsURL') . "/";
   
     my %shash; # sort order (key is resource location, value is sort order)      my @resources;
     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,\%nhash);   &readfromfile($r,\@resources);
       } elsif ($env{'form.bookmarks'}) {
    &readfrombookmarks($r,\@resources);
     } else {      } else {
  &readfromdb($r,\%shash,\%thash);   &readfromdb($r,\@resources);
     }      }
   
     my $ctr = 0;      my $ctr = 0;
     my $clen = scalar(keys %shash);      my $clen = scalar(@resources);
     if (($clen > 1) || ($env{'form.readfile'})) {      if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
  my %lt=&Apache::lonlocal::texthash(   my %lt=&Apache::lonlocal::texthash(
  'fin'=> 'Finalize order of resources',   'fin'=> 'Finalize order of resources',
  'gb' => 'Go Back',   'ci' => 'Continue Import',
  'ns' => 'New Search',   'cs' => 'Continue Search',
  'fi' => 'Finish Import',   'fi' => 'Finish Import',
    're' => 'Recover Checked',
  'ca' => 'Cancel',   'ca' => 'Cancel',
  'co' => 'Change Order',   'co' => 'Change Order',
  'ti' => 'Title',   'ti' => 'Title',
  'pa' => 'Path',   'pa' => 'Path',
                 'in' => 'Include'                  'in' => 'Include'
  );   );
  $r->print(&Apache::loncommon::start_page('Sort Imported Resources',   my $title = ($env{'form.recover'}) ? 'Recover Removed Resources'
  $js));                                             : 'Sort Imported Resources';
    $r->print(&Apache::loncommon::start_page($title, $js));
   
  $r->print(<<END);   $r->print(<<END);
 <b><font color="#888888">$lt{'fin'}</font></b>  
 <form method='post' action='/adm/groupsort' name='groupsort'  <form method='post' action='/adm/groupsort' name='groupsort'
       enctype='application/x-www-form-urlencoded'>        enctype='application/x-www-form-urlencoded'>
 <input type="hidden" name="fnum" value="$clen" />  <input type="hidden" name="fnum" value="$clen" />
Line 370  END Line 332  END
 <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="readfile" value="$env{'form.readfile'}" />
   <input type="hidden" name="bookmarks" value="$env{'form.bookmarks'}" />
 <input type="hidden" name="recover" value="$env{'form.recover'}" />  <input type="hidden" name="recover" value="$env{'form.recover'}" />
 END  END
   
         # --- Expand here if "GO BACK" button desired          $r->print(&Apache::loncommon::inhibit_menu_check('input'));
         if ($env{'form.catalogmode'} eq 'groupimport') {          # ---
             my $resurl = &Apache::loncommon::lastresurl();      
           if ($env{'form.recover'}) {
     $r->print(<<END);      $r->print(<<END);
 <input type="button" name="alter" value="$lt{'gb'}"  <input type="button" name="alter" value="$lt{'re'}"
  onClick="window.location='$resurl?catalogmode=groupimport'" />&nbsp;   onClick="finish_import()" />&nbsp;
   <input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
 END  END
         }   } else {
  if ($env{'form.catalogmode'} eq 'groupsearch') {          # --- Continue Buttons
       my $resurl = 
    &Apache::loncommon::escape_single(&Apache::loncommon::lastresurl());
     $r->print(<<END);      $r->print(<<END);
 <input type="button" name="alter" value="$lt{'ns'}"  <h2>$lt{'fin'}</h2>
  onClick="window.location='/adm/searchcat?catalogmode=groupsearch&cleargroupsort=1'" />&nbsp;  <div>
 END  <input type="button" name="alter" value="$lt{'ci'}"
         }   onClick="window.location='$resurl?inhibitmenu=yes&amp;catalogmode=import'" />&nbsp;
         # ---  <input type="button" name="altersearch" value="$lt{'cs'}"
    onClick="window.location='/adm/searchcat?inhibitmenu=yes&amp;catalogmode=import'" />&nbsp;
  $r->print(<<END);  
 <input type="button" name="alter" value="$lt{'fi'}"  <input type="button" name="alter" value="$lt{'fi'}"
  onClick="finish_import()" />&nbsp;   onClick="finish_import()" />&nbsp;
 <input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />  <input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
   </div>
   <br />
 END  END
         $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");          }
  $r->print("<table border=0><tr>\n");          $r->print(&Apache::loncommon::start_data_table()
  if ($env{'form.readfile'}) {                    .&Apache::loncommon::start_data_table_header_row());
     $r->print("<td bgcolor='$titleclr'><b>$lt{'in'}</b></td>\n");   if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { 
       $r->print("<th>$lt{'in'}</th>\n");
  } else {    } else { 
     $r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'co'}</b></td>\n");       $r->print("<th colspan='2'>$lt{'co'}</th>\n"); 
  }   }
  $r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'ti'}</b></td>\n");   $r->print("<th colspan='2'>$lt{'ti'}</th>\n");
  $r->print("<td bgcolor='$titleclr'><b>$lt{'pa'}</b></td></tr>\n");   $r->print("<th>$lt{'pa'}</th>");
           $r->print(&Apache::loncommon::end_data_table_header_row()
                    ."\n");
     } else {      } else {
  $r->print(&Apache::loncommon::start_page(undef,$js,   $r->print(&Apache::loncommon::start_page(undef,$js,
  {'only_body' => 1}));   {'only_body' => 1}));
Line 414  END Line 385  END
 <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'}" />
 END  END
           $r->print(&Apache::loncommon::inhibit_menu_check('input'));
   
     }      }
     foreach (sort {$shash{$a}<=>$shash{$b}} (keys %shash)) {      foreach my $resource (@resources) {
  my $key=$_;  
  $ctr++;   $ctr++;
  my $iconname=&Apache::loncommon::icon($key);   my $iconname=&Apache::loncommon::icon($resource->{'url'});
  if (($clen > 1) || ($env{'form.readfile'})) {   if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
     $r->print("<tr><td bgcolor='$fileclr'>");      $r->print(&Apache::loncommon::start_data_table_row()
             if ($env{'form.readfile'}) {                       ."<td>");
               if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
  $r->print(&checkbox($ctr-1));   $r->print(&checkbox($ctr-1));
     } else {      } else {
  $r->print(&movers($clen,$ctr));   $r->print(&movers($clen,$ctr));
     }      }
  }   }
  $r->print(&hidden($ctr-1,$thash{$key},$key));   $r->print(&hidden($ctr-1,$resource->{'title'},$resource->{'url'},
  if (($clen > 1)  || ($env{'form.readfile'})) {    $resource->{'id'}));
    if (($clen > 1)  || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
     $r->print("</td>");      $r->print("</td>");
             unless ($env{'form.readfile'}) {              unless (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
  $r->print("<td bgcolor='$fileclr'>".   $r->print("<td>".
   &select_box($clen,$ctr).    &select_box($clen,$ctr).
   "</td>");    "</td>");
     }      }
     $r->print("<td bgcolor='$fileclr'>");      $r->print("<td>");
     $r->print("<img src='$iconname' />");      $r->print("<img src='$iconname' />");
     $r->print("</td><td bgcolor='$fileclr'>");      $r->print("</td><td>");
     $r->print("$thash{$key}$nhash{$key}</td><td bgcolor='$fileclr'>\n");      $r->print($resource->{'title'}.$resource->{'notes'}."</td><td>\n");
     $r->print("$key</td></tr>\n");      $r->print($resource->{'url'}."</td>"
                        .&Apache::loncommon::end_data_table_row()
                        ."\n");
  }    } 
     }      }
     if (($clen > 1) || ($env{'form.readfile'})) {      if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
  $r->print("</table></td></tr></table></form>");          $r->print(&Apache::loncommon::end_data_table()
                    ."</form>");
     } else {      } else {
  $r->print(<<END);   $r->print(<<END);
 <script type="text/javascript">  <script type="text/javascript">
Line 459  END Line 436  END
   
 # --------------------------------------- Hidden values (returns scalar string)  # --------------------------------------- Hidden values (returns scalar string)
 sub hidden {  sub hidden {
     my ($sel,$title,$filelink) = @_;      my ($sel,$title,$filelink,$id) = @_;
     my $string = '<input type="hidden" name="title'.$sel.'" value="'.$title.      my $string = '<input type="hidden" name="title'.$sel.'" value="'.
  '" />';   &escape($title).'" />';
       $filelink=~s|^/ext/|http://|;
     $string .= '<input type="hidden" name="filelink'.$sel.'" value="'.      $string .= '<input type="hidden" name="filelink'.$sel.'" value="'.
  $filelink.'" />';   &escape($filelink).'" />';
       $string .= '<input type="hidden" name="id'.$sel.'" value="'.&escape($id).'" />';
     return $string;      return $string;
 }  }
   
Line 516  sub checkbox { Line 495  sub checkbox {
 1;  1;
   
 __END__  __END__
   
   =pod
   
   =head1 NAME
   
   Apache::groupsort.pm
   
   =head1 SYNOPSIS
   
   Implements a second phase of importing
   multiple resources into the RAT. Allows for
   reordering the sequence of resources
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org.
   
   
   =head1 NOTABLE SUBROUTINES
   
   =over
   
   =item 
   
   =back
   
   =cut
   
Removed from v.1.41  
changed lines
  Added in v.1.63

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