--- loncom/interface/groupsort.pm 2002/05/09 23:07:36 1.9 +++ loncom/interface/groupsort.pm 2005/04/07 06:56:22 1.31 @@ -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.31 2005/04/07 06:56:22 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,31 +37,49 @@ 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 { + 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'; - $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=(< @@ -124,9 +140,7 @@ function orderchange(val,newval) { } - END - # read pertinent machine configuration my $domain = $r->dir_config('lonDefDomain'); $iconpath = $r->dir_config('lonIconsURL') . "/"; @@ -135,39 +149,60 @@ END my %thash; # title (key is resource location, value is title) my $diropendb; - if ($ENV{'form.catalogmode'} eq 'groupsearch') { +# ------------------------------ which file do we open? Easy if explictly given + if ($env{'form.catalogmode'} eq 'groupsearch') { + $diropendb = + "/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'}_searchcat.db"; + "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_indexer.db"; } - elsif ($ENV{'form.catalogmode'} eq 'groupimport') { + elsif ($env{'form.catalogmode'} eq 'groupsec') { $diropendb = - "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.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 - my $dsearch; my $dindex; - my $dsearcht; my $dindext; - $dsearch = - "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_searchcat.db"; - if (-e $dsearch) { - $dsearcht=(stat($dsearch))[9]; + my @dbfn; + my @dbst; + + $dbfn[0] = + "/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]; } - $dindex = - "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db"; - if (-e $dindex) { - $dindext=(stat($dindex))[9]; + $dbfn[1] = + "/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]; } - if (!$dsearcht and !$dindext) { - $diropendb=''; - } - elsif ($dsearcht>$dindext) { - $diropendb=$dsearch; + $dbfn[2] = + "/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]; } - 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)) { - my $acts = $ENV{'form.acts'}; +# ----------------------------- 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; my %achash; @@ -200,10 +235,14 @@ 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'}) { + if ($env{'form.oldval'}) { my $newctr = 0; my %chash; foreach (sort {$shash{$a} <=> $shash{$b}} (keys %shash)) { @@ -213,8 +252,8 @@ END $hash{'storectr_'.$key} = $newctr; $chash{$newctr} = $key; } - my $oldval = $ENV{'form.oldval'}; - my $newval = $ENV{'form.newval'}; + my $oldval = $env{'form.oldval'}; + my $newval = $env{'form.newval'}; if ($oldval != $newval) { # when newval==0, then push down and delete if ($newval!=0) { @@ -256,61 +295,98 @@ 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(< 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'} + + END - 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(<  + } + if ($env{'form.catalogmode'} eq 'groupsearch') { + $r->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"); + $r->print("
Change orderTitlePath
"); + $r->print("\n"); + $r->print("\n"); + $r->print("\n"); + $r->print("\n"); + } else { + $r->print(< + + + + + +END + } 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("
$lt{'co'}$lt{'ti'}$lt{'pa'}
"); - $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; }