--- loncom/interface/groupsort.pm 2002/05/13 16:00:53 1.10 +++ loncom/interface/groupsort.pm 2002/09/16 20:57:28 1.16 @@ -2,7 +2,7 @@ # The LON-CAPA group sort handler # Allows for sorting prior to import into RAT. # -# $Id: groupsort.pm,v 1.10 2002/05/13 16:00:53 www Exp $ +# $Id: groupsort.pm,v 1.16 2002/09/16 20:57:28 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,6 +39,7 @@ 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 @@ -49,7 +50,6 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['acts','catalogmode','mode']); - # color scheme my $fileclr = '#ffffe6'; my $titleclr = '#ddffff'; @@ -131,9 +131,8 @@ function orderchange(val,newval) { } - END - + $r->print(&Apache::loncommon::bodytag('Sort Imported Resources')); # read pertinent machine configuration my $domain = $r->dir_config('lonDefDomain'); $iconpath = $r->dir_config('lonIconsURL') . "/"; @@ -142,6 +141,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"; @@ -150,30 +150,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; @@ -263,17 +283,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(<