--- loncom/interface/groupsort.pm 2002/05/24 13:53:43 1.11 +++ loncom/interface/groupsort.pm 2003/10/08 20:33:34 1.21.2.1 @@ -2,7 +2,7 @@ # The LON-CAPA group sort handler # Allows for sorting prior to import into RAT. # -# $Id: groupsort.pm,v 1.11 2002/05/24 13:53:43 www Exp $ +# $Id: groupsort.pm,v 1.21.2.1 2003/10/08 20:33:34 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,9 +27,7 @@ # http://www.lon-capa.org/ # # YEAR=2001 -# 8/7,8/8,10/14,10/15,12/10 Scott Harrison # YEAR=2002 -# 1/17 Scott Harrison # ### @@ -39,17 +37,26 @@ use strict; use Apache::Constants qw(:common); use GDBM_File; +use Apache::loncommon; my %hash; # variable to tie to user specific database my $iconpath; # variable to be accessible to multiple subroutines +sub cleanup { + if (tied(%hash)){ + &Apache::lonnet::logthis('Cleanup groupsort: hash'); + unless (untie(%hash)) { + &Apache::lonnet::logthis('Failed cleanup groupsort: hash'); + } + } +} + # ---------------------------------------------------------------- Main Handler sub handler { my $r = shift; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['acts','catalogmode','mode']); - # color scheme my $fileclr = '#ffffe6'; my $titleclr = '#ddffff'; @@ -60,7 +67,7 @@ sub handler { # finish_import looks different for graphical or "simple" RAT my $finishimport=''; - if ($ENV{'form.mode'} eq 'simple') { + if ($ENV{'form.mode'} eq 'simple' || $ENV{'form.mode'} eq '') { $finishimport=(< - END - + $r->print(&Apache::loncommon::bodytag('Sort Imported Resources')); # read pertinent machine configuration my $domain = $r->dir_config('lonDefDomain'); $iconpath = $r->dir_config('lonIconsURL') . "/"; @@ -145,15 +151,15 @@ END # ------------------------------ which file do we open? Easy if explictly given if ($ENV{'form.catalogmode'} eq 'groupsearch') { $diropendb = - "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_searchcat.db"; + "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_searchcat.db"; } elsif ($ENV{'form.catalogmode'} eq 'groupimport') { $diropendb = - "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db"; + "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_indexer.db"; } elsif ($ENV{'form.catalogmode'} eq 'groupsec') { $diropendb = - "/home/httpd/perl/tmp/$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 else { # choose last accessed @@ -161,19 +167,19 @@ END my @dbst; $dbfn[0] = - "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_searchcat.db"; + "/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/$domain\_$ENV{'user.name'}_indexer.db"; + "/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/$domain\_$ENV{'user.name'}_groupsec.db"; + "/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]; @@ -184,7 +190,7 @@ END # Okay, find most recent existing my $newest=0; - my $diropendb=''; + $diropendb=''; for (my $i=0; $i<=$#dbfn; $i++) { if ($dbst[$i]>$newest) { $newest=$dbst[$i]; @@ -194,7 +200,7 @@ END } # ----------------------------- 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 = split(/b/,$acts); my %ahash; @@ -284,16 +290,14 @@ END untie %hash; my $ctr = 0; my $clen = scalar(keys %shash); - $r->print('

The LearningOnline With CAPA '. - 'Group Sorter

'."\n"); - $r->print('Finalize order of resources'. - ''."\n"); - $r->print("
"); - $r->print(<print(<Finalize order of resources + + END # --- Expand here if "GO BACK" button desired @@ -305,10 +309,10 @@ END } if ($ENV{'form.catalogmode'} eq 'groupsearch') { $r->print(<  +  END -} + } # --- $r->print(<print(""); $r->print(&movers($clen,$ctr)); $r->print(&hidden($ctr-1,$thash{$key},$key)); $r->print(""); $r->print(&select_box($clen,$ctr)); $r->print(""); - $r->print(""); + $r->print(""); $r->print(""); $r->print("$thash{$key}\n"); $r->print("$key\n");