--- loncom/interface/groupsort.pm 2002/05/09 23:07:36 1.9 +++ loncom/interface/groupsort.pm 2003/02/03 18:03:52 1.19 @@ -2,7 +2,7 @@ # The LON-CAPA group sort handler # Allows for sorting prior to import into RAT. # -# $Id: groupsort.pm,v 1.9 2002/05/09 23:07:36 www Exp $ +# $Id: groupsort.pm,v 1.19 2003/02/03 18:03:52 harris41 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'; @@ -63,7 +70,14 @@ sub handler { if ($ENV{'form.mode'} eq 'simple') { $finishimport=(<dir_config('lonDefDomain'); $iconpath = $r->dir_config('lonIconsURL') . "/"; @@ -135,6 +148,7 @@ END my %thash; # title (key is resource location, value is title) my $diropendb; +# ------------------------------ 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"; @@ -143,30 +157,50 @@ END $diropendb = "/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 - my $dsearch; my $dindex; - my $dsearcht; my $dindext; - $dsearch = + my @dbfn; + my @dbst; + + $dbfn[0] = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_searchcat.db"; - if (-e $dsearch) { - $dsearcht=(stat($dsearch))[9]; + $dbst[0]=-1; + if (-e $dbfn[0]) { + $dbst[0]=(stat($dbfn[0]))[9]; } - $dindex = + $dbfn[1] = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db"; - if (-e $dindex) { - $dindext=(stat($dindex))[9]; + $dbst[1]=-1; + if (-e $dbfn[1]) { + $dbst[1]=(stat($dbfn[1]))[9]; } - if (!$dsearcht and !$dindext) { - $diropendb=''; - } - elsif ($dsearcht>$dindext) { - $diropendb=$dsearch; + $dbfn[2] = + "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_groupsec.db"; + $dbst[2]=-1; + if (-e $dbfn[2]) { + $dbst[2]=(stat($dbfn[2]))[9]; } - else { - $diropendb=$dindex; - } +# 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]; + } + } + } - if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) { +# ----------------------------- diropendb is now the filename of the db to open + if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) { my $acts = $ENV{'form.acts'}; my @Acts = split(/b/,$acts); my %ahash; @@ -256,17 +290,17 @@ 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 if ($ENV{'form.catalogmode'} eq 'groupimport') { $r->print(<print(<  +  END -} + } +# --- + $r->print(<