Diff for /loncom/interface/groupsort.pm between versions 1.10 and 1.11

version 1.10, 2002/05/13 16:00:53 version 1.11, 2002/05/24 13:53:43
Line 142  END Line 142  END
     my %thash; # title (key is resource location, value is title)      my %thash; # title (key is resource location, value is title)
   
     my $diropendb;      my $diropendb;
   # ------------------------------ which file do we open? Easy if explictly given
     if ($ENV{'form.catalogmode'} eq 'groupsearch') {      if ($ENV{'form.catalogmode'} eq 'groupsearch') {
  $diropendb =    $diropendb = 
     "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_searchcat.db";      "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_searchcat.db";
Line 150  END Line 151  END
  $diropendb =    $diropendb = 
     "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";      "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
     }      }
       elsif ($ENV{'form.catalogmode'} eq 'groupsec') {
    $diropendb = 
       "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_groupsec.db";
       }
   # --------------------- not explicitly given, choose the one most recently used
     else { # choose last accessed      else { # choose last accessed
  my $dsearch; my $dindex;          my @dbfn;
  my $dsearcht; my $dindext;          my @dbst;
  $dsearch =  
    $dbfn[0] =
     "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_searchcat.db";      "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_searchcat.db";
  if (-e $dsearch) {          $dbst[0]=-1;
     $dsearcht=(stat($dsearch))[9];   if (-e $dbfn[0]) {
       $dbst[0]=(stat($dbfn[0]))[9];
  }   }
  $dindex =   $dbfn[1] =
             "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";              "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
  if (-e $dindex) {          $dbst[1]=-1;
             $dindext=(stat($dindex))[9];   if (-e $dbfn[1]) {
               $dbst[1]=(stat($dbfn[1]))[9];
         }          }
  if (!$dsearcht and !$dindext) {   $dbfn[2] =
     $diropendb='';              "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_groupsec.db";
  }          $dbst[2]=-1;
         elsif ($dsearcht>$dindext) {   if (-e $dbfn[2]) {
             $diropendb=$dsearch;              $dbst[2]=(stat($dbfn[2]))[9];
         }          }
  else {  # Expand here for more modes
             $diropendb=$dindex;  # ....
  }  
   # Okay, find most recent existing
   
           my $newest=0;
           my $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
     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'};
  my @Acts = split(/b/,$acts);   my @Acts = split(/b/,$acts);
Line 274  END Line 295  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="" />
 END  END
   
   # --- Expand here if "GO BACK" button desired
     if ($ENV{'form.catalogmode'} eq 'groupimport') {      if ($ENV{'form.catalogmode'} eq 'groupimport') {
  $r->print(<<END);   $r->print(<<END);
 <input type="button" name="alter" value="GO BACK"  <input type="button" name="alter" value="GO BACK"
Line 286  END Line 309  END
  onClick="window.location='/adm/searchcat?catalogmode=groupsearch'" />&nbsp;   onClick="window.location='/adm/searchcat?catalogmode=groupsearch'" />&nbsp;
 END  END
 }  }
   # ---
   
     $r->print(<<END);      $r->print(<<END);
 <input type="button" name="alter" value="FINISH IMPORT"  <input type="button" name="alter" value="FINISH IMPORT"
  onClick="finish_import()" />&nbsp;   onClick="finish_import()" />&nbsp;

Removed from v.1.10  
changed lines
  Added in v.1.11


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