--- loncom/interface/groupsort.pm 2003/01/09 22:04:28 1.17 +++ loncom/interface/groupsort.pm 2005/02/17 08:29:42 1.30 @@ -2,7 +2,7 @@ # The LON-CAPA group sort handler # Allows for sorting prior to import into RAT. # -# $Id: groupsort.pm,v 1.17 2003/01/09 22:04:28 www Exp $ +# $Id: groupsort.pm,v 1.30 2005/02/17 08:29:42 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 # ### @@ -40,12 +38,19 @@ use strict; use Apache::Constants qw(:common); use GDBM_File; use Apache::loncommon; +use Apache::lonlocal; +use Apache::lonnet; my %hash; # variable to tie to user specific database my $iconpath; # variable to be accessible to multiple subroutines sub cleanup { - untie(%hash) if (tied(%hash)); + if (tied(%hash)){ + &Apache::lonnet::logthis('Cleanup groupsort: hash'); + unless (untie(%hash)) { + &Apache::lonnet::logthis('Failed cleanup groupsort: hash'); + } + } } # ---------------------------------------------------------------- Main Handler @@ -58,13 +63,13 @@ sub handler { my $fileclr = '#ffffe6'; my $titleclr = '#ddffff'; - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; # 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=(<print(< +$html The LearningOnline Network With CAPA Group Sorter END - $r->print(&Apache::loncommon::bodytag('Sort Imported Resources')); # read pertinent machine configuration my $domain = $r->dir_config('lonDefDomain'); $iconpath = $r->dir_config('lonIconsURL') . "/"; @@ -148,15 +152,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 @@ -164,19 +168,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]; @@ -231,7 +235,11 @@ END my $key = $_; $key =~ s/^store_//; $shash{$key} = $hash{'storectr_'.$key}; - $thash{$key} = $hash{'store_'.$key}; + if (&Apache::lonnet::gettitle($key) eq '') { + $thash{$key} = $hash{'store_'.$key}; + } else { + $thash{$key} = &Apache::lonnet::gettitle($key); + } } } if ($ENV{'form.oldval'}) { @@ -287,8 +295,20 @@ END untie %hash; my $ctr = 0; my $clen = scalar(keys %shash); - $r->print(<Finalize order of resources + if ($clen > 1) { + my %lt=&Apache::lonlocal::texthash( + 'fin'=> 'Finalize order of resources', + 'gb' => 'Go Back', + 'ns' => 'New Search', + 'fi' => 'Finish Import', + 'ca' => 'Cancel', + 'co' => 'Change Order', + 'ti' => 'Title', + 'pa' => 'Path' + ); + $r->print(&Apache::loncommon::bodytag('Sort Imported Resources')); + $r->print(<$lt{'fin'}
@@ -297,53 +317,76 @@ END END -# --- Expand here if "GO BACK" button desired - if ($ENV{'form.catalogmode'} eq 'groupimport') { - $r->print(<  + # --- Expand here if "GO BACK" button desired + if ($ENV{'form.catalogmode'} eq 'groupimport') { + my $resurl = &Apache::loncommon::lastresurl(); + $r->print(<  END - } - if ($ENV{'form.catalogmode'} eq 'groupsearch') { - $r->print(<print(<  END - } -# --- + } + # --- - $r->print(<print(<  - + +END + $r->print("\n"); + } + } + if ($clen > 1) { + $r->print("
"); + $r->print("\n"); + $r->print("\n"); + $r->print("\n"); + $r->print("\n"); + } else { + $r->print(< + + + + + END - $r->print("
$lt{'co'}$lt{'ti'}$lt{'pa'}
"); - $r->print("\n"); - $r->print("". - "\n"); - $r->print("\n"); - $r->print("\n"); + } foreach (sort {$shash{$a}<=>$shash{$b}} (keys %shash)) { my $key=$_; $ctr++; - my @file_ext = split(/\./,$key); - my $curfext = $file_ext[scalar(@file_ext)-1]; - $r->print("\n"); - } - $r->print("
Change orderTitlePath
"); - $r->print(&movers($clen,$ctr)); + my $iconname=&Apache::loncommon::icon($key); + if ($clen > 1) { + $r->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("$thash{$key}\n"); - $r->print("$key
"); + if ($clen > 1) { + $r->print("		"); + $r->print(&select_box($clen,$ctr)); + $r->print(""); + $r->print(""); + $r->print(""); + $r->print("$thash{$key}\n"); + $r->print("$key
"); + } else { + $r->print(< + finish_import(); + +END + } $r->print(< END + return OK; }