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

Diff for /loncom/interface/groupsort.pm between versions 1.30 and 1.31

version 1.30, 2005/02/17 08:29:42 version 1.31, 2005/04/07 06:56:22
Line 69  sub handler { Line 69  sub handler {
   
 # finish_import looks different for graphical or "simple" RAT  # finish_import looks different for graphical or "simple" RAT
     my $finishimport='';      my $finishimport='';
     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='';
Line 150  END Line 150  END
   
     my $diropendb;      my $diropendb;
 # ------------------------------ which file do we open? Easy if explictly given  # ------------------------------ 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/$ENV{'user.domain'}_$ENV{'user.name'}_searchcat.db";      "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_searchcat.db";
     }      }
     elsif ($ENV{'form.catalogmode'} eq 'groupimport') {      elsif ($env{'form.catalogmode'} eq 'groupimport') {
  $diropendb =    $diropendb = 
     "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_indexer.db";      "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_indexer.db";
     }      }
     elsif ($ENV{'form.catalogmode'} eq 'groupsec') {      elsif ($env{'form.catalogmode'} eq 'groupsec') {
  $diropendb =    $diropendb = 
     "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_groupsec.db";      "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_groupsec.db";
     }      }
 # --------------------- not explicitly given, choose the one most recently used  # --------------------- not explicitly given, choose the one most recently used
     else { # choose last accessed      else { # choose last accessed
Line 168  END Line 168  END
         my @dbst;          my @dbst;
   
  $dbfn[0] =   $dbfn[0] =
     "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_searchcat.db";      "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_searchcat.db";
         $dbst[0]=-1;          $dbst[0]=-1;
  if (-e $dbfn[0]) {   if (-e $dbfn[0]) {
     $dbst[0]=(stat($dbfn[0]))[9];      $dbst[0]=(stat($dbfn[0]))[9];
  }   }
  $dbfn[1] =   $dbfn[1] =
             "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_indexer.db";              "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_indexer.db";
         $dbst[1]=-1;          $dbst[1]=-1;
  if (-e $dbfn[1]) {   if (-e $dbfn[1]) {
             $dbst[1]=(stat($dbfn[1]))[9];              $dbst[1]=(stat($dbfn[1]))[9];
         }          }
  $dbfn[2] =   $dbfn[2] =
             "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_groupsec.db";              "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_groupsec.db";
         $dbst[2]=-1;          $dbst[2]=-1;
  if (-e $dbfn[2]) {   if (-e $dbfn[2]) {
             $dbst[2]=(stat($dbfn[2]))[9];              $dbst[2]=(stat($dbfn[2]))[9];
Line 202  END Line 202  END
     }      }
 # ----------------------------- 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'};
  my @Acts = split(/b/,$acts);   my @Acts = split(/b/,$acts);
  my %ahash;   my %ahash;
  my %achash;   my %achash;
Line 242  END Line 242  END
  }   }
     }      }
  }   }
  if ($ENV{'form.oldval'}) {   if ($env{'form.oldval'}) {
     my $newctr = 0;      my $newctr = 0;
     my %chash;      my %chash;
     foreach (sort {$shash{$a} <=> $shash{$b}} (keys %shash)) {      foreach (sort {$shash{$a} <=> $shash{$b}} (keys %shash)) {
Line 252  END Line 252  END
  $hash{'storectr_'.$key} = $newctr;   $hash{'storectr_'.$key} = $newctr;
  $chash{$newctr} = $key;   $chash{$newctr} = $key;
     }      }
     my $oldval = $ENV{'form.oldval'};      my $oldval = $env{'form.oldval'};
     my $newval = $ENV{'form.newval'};      my $newval = $env{'form.newval'};
     if ($oldval != $newval) {      if ($oldval != $newval) {
  # when newval==0, then push down and delete   # when newval==0, then push down and delete
  if ($newval!=0) {   if ($newval!=0) {
Line 314  END Line 314  END
 <input type="hidden" name="fnum" value="$clen" />  <input type="hidden" name="fnum" value="$clen" />
 <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'}" />
 END  END
   
         # --- Expand here if "GO BACK" button desired          # --- Expand here if "GO BACK" button desired
         if ($ENV{'form.catalogmode'} eq 'groupimport') {          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{'gb'}"  <input type="button" name="alter" value="$lt{'gb'}"
  onClick="window.location='$resurl?catalogmode=groupimport'" />&nbsp;   onClick="window.location='$resurl?catalogmode=groupimport'" />&nbsp;
 END  END
         }          }
  if ($ENV{'form.catalogmode'} eq 'groupsearch') {   if ($env{'form.catalogmode'} eq 'groupsearch') {
     $r->print(<<END);      $r->print(<<END);
 <input type="button" name="alter" value="$lt{'ns'}"  <input type="button" name="alter" value="$lt{'ns'}"
  onClick="window.location='/adm/searchcat?catalogmode=groupsearch&cleargroupsort=1'" />&nbsp;   onClick="window.location='/adm/searchcat?catalogmode=groupsearch&cleargroupsort=1'" />&nbsp;
Line 351  END Line 351  END
 <input type="hidden" name="fnum" value="$clen" />  <input type="hidden" name="fnum" value="$clen" />
 <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'}" />
 END  END
     }      }
     foreach (sort {$shash{$a}<=>$shash{$b}} (keys %shash)) {      foreach (sort {$shash{$a}<=>$shash{$b}} (keys %shash)) {
Removed from v.1.30  
changed lines
  Added in v.1.31

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