--- loncom/interface/groupsort.pm 2006/02/07 19:46:30 1.39
+++ loncom/interface/groupsort.pm 2006/06/08 07:20:41 1.42
@@ -2,7 +2,7 @@
# The LON-CAPA group sort handler
# Allows for sorting prior to import into RAT.
#
-# $Id: groupsort.pm,v 1.39 2006/02/07 19:46:30 albertel Exp $
+# $Id: groupsort.pm,v 1.42 2006/06/08 07:20:41 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -45,55 +45,9 @@ my %hash; # variable to tie to user spec
sub readfromdb {
my ($r,$shash,$thash)=@_;
- my $diropendb;
-# ------------------------------ 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/$env{'user.domain'}_$env{'user.name'}_indexer.db";
- } elsif ($env{'form.catalogmode'} eq 'groupsec') {
- $diropendb =
- "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_groupsec.db";
- } else {
-# --------------------- not explicitly given, choose the one most recently used
- 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];
- }
- $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];
- }
- $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];
- }
-# 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];
- }
- }
+ my $diropendb =
+ "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db";
- }
# ----------------------------- diropendb is now the filename of the db to open
if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
my $acts = $env{'form.acts'};
@@ -110,8 +64,6 @@ sub readfromdb {
foreach (sort {$achash{$a} <=> $achash{$b}} (keys %ahash)) {
my $key = $_;
if ($ahash{$key} eq '1') {
-# my $keyz=join("
",keys %hash);
-# print "
$key
$keyz".$hash{'pre_'.$key.'_link'}."
\n";
$hash{'store_'.$hash{'pre_'.$key.'_link'}} =
$hash{'pre_'.$key.'_title'};
$hash{'storectr_'.$hash{'pre_'.$key.'_link'}} =
@@ -244,7 +196,7 @@ sub handler {
my $r = shift;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['acts','catalogmode','mode','readfile','recover']);
+ ['acts','mode','readfile','recover']);
# color scheme
my $fileclr = '#ffffe6';
my $titleclr = '#ddffff';
@@ -301,12 +253,8 @@ ENDADV
}
# output start of web page
- my $html=&Apache::lonxml::xmlbegin();
- $r->print(<
-The LearningOnline Network With CAPA Group Sorter
-
-
END
# read pertinent machine configuration
my $domain = $r->dir_config('lonDefDomain');
@@ -355,8 +302,8 @@ END
if (($clen > 1) || ($env{'form.readfile'})) {
my %lt=&Apache::lonlocal::texthash(
'fin'=> 'Finalize order of resources',
- 'gb' => 'Go Back',
- 'ns' => 'New Search',
+ 'ci' => 'Continue Import',
+ 'cs' => 'Continue Search',
'fi' => 'Finish Import',
'ca' => 'Cancel',
'co' => 'Change Order',
@@ -364,7 +311,8 @@ END
'pa' => 'Path',
'in' => 'Include'
);
- $r->print(&Apache::loncommon::bodytag('Sort Imported Resources'));
+ $r->print(&Apache::loncommon::start_page('Sort Imported Resources',
+ $js));
$r->print(<$lt{'fin'}
END
- # --- 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(<
+ # --- Continue Buttons
+ my $resurl = &Apache::loncommon::lastresurl();
+ $r->print(<
+
END
- }
# ---
$r->print(<print("$lt{'ti'} | \n");
$r->print("$lt{'pa'} | \n");
} else {
+ $r->print(&Apache::loncommon::start_page(undef,$js,
+ {'only_body' => 1}));
$r->print(<