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

version 1.41, 2006/03/26 19:44:45 version 1.42, 2006/06/08 07:20:41
Line 45  my %hash; # variable to tie to user spec Line 45  my %hash; # variable to tie to user spec
 sub readfromdb {  sub readfromdb {
     my ($r,$shash,$thash)=@_;      my ($r,$shash,$thash)=@_;
   
     my $diropendb;      my $diropendb = 
 # ------------------------------ which file do we open? Easy if explictly given         "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db";
     if ($env{'form.catalogmode'} eq 'groupsearch') {  
  $diropendb =   
     "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_searchcat.db";  
     } elsif ($env{'form.catalogmode'} eq 'groupimport') {  
  $diropendb =   
     "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_indexer.db";  
     } elsif ($env{'form.catalogmode'} eq 'groupsec') {  
  $diropendb =   
     "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_groupsec.db";  
     } else {  
 # --------------------- not explicitly given, choose the one most recently used  
         my @dbfn;  
         my @dbst;  
   
  $dbfn[0] =  
     "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_searchcat.db";  
         $dbst[0]=-1;  
  if (-e $dbfn[0]) {  
     $dbst[0]=(stat($dbfn[0]))[9];  
  }  
  $dbfn[1] =  
             "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_indexer.db";  
         $dbst[1]=-1;  
  if (-e $dbfn[1]) {  
             $dbst[1]=(stat($dbfn[1]))[9];  
         }  
  $dbfn[2] =  
             "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_groupsec.db";  
         $dbst[2]=-1;  
  if (-e $dbfn[2]) {  
             $dbst[2]=(stat($dbfn[2]))[9];  
         }  
 # Expand here for more modes  
 # ....  
   
 # Okay, find most recent existing  
   
         my $newest=0;  
         $diropendb='';  
         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'};   my $acts = $env{'form.acts'};
Line 110  sub readfromdb { Line 64  sub readfromdb {
  foreach (sort {$achash{$a} <=> $achash{$b}} (keys %ahash)) {   foreach (sort {$achash{$a} <=> $achash{$b}} (keys %ahash)) {
     my $key = $_;      my $key = $_;
     if ($ahash{$key} eq '1') {      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{'store_'.$hash{'pre_'.$key.'_link'}} =
     $hash{'pre_'.$key.'_title'};      $hash{'pre_'.$key.'_title'};
  $hash{'storectr_'.$hash{'pre_'.$key.'_link'}} =   $hash{'storectr_'.$hash{'pre_'.$key.'_link'}} =
Line 244  sub handler { Line 196  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']);
     # color scheme      # color scheme
     my $fileclr = '#ffffe6';      my $fileclr = '#ffffe6';
     my $titleclr = '#ddffff';      my $titleclr = '#ddffff';
Line 350  END Line 302  END
     if (($clen > 1) || ($env{'form.readfile'})) {      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',   'ci' => 'Continue Import',
  'ns' => 'New Search',   'cs' => 'Continue Search',
  'fi' => 'Finish Import',   'fi' => 'Finish Import',
  'ca' => 'Cancel',   'ca' => 'Cancel',
  'co' => 'Change Order',   'co' => 'Change Order',
Line 373  END Line 325  END
 <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          # --- Continue Buttons
         if ($env{'form.catalogmode'} eq 'groupimport') {          my $resurl = &Apache::loncommon::lastresurl();
             my $resurl = &Apache::loncommon::lastresurl();          $r->print(<<END);
     $r->print(<<END);  <input type="button" name="alter" value="$lt{'ci'}"
 <input type="button" name="alter" value="$lt{'gb'}"   onClick="window.location='$resurl'" />&nbsp;
  onClick="window.location='$resurl?catalogmode=groupimport'" />&nbsp;  <input type="button" name="altersearch" value="$lt{'cs'}"
    onClick="window.location='/adm/searchcat'" />&nbsp;
 END  END
         }  
  if ($env{'form.catalogmode'} eq 'groupsearch') {  
     $r->print(<<END);  
 <input type="button" name="alter" value="$lt{'ns'}"  
  onClick="window.location='/adm/searchcat?catalogmode=groupsearch&cleargroupsort=1'" />&nbsp;  
 END  
         }  
         # ---          # ---
   
  $r->print(<<END);   $r->print(<<END);

Removed from v.1.41  
changed lines
  Added in v.1.42


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