--- loncom/interface/groupsort.pm 2002/08/27 12:18:13 1.15
+++ loncom/interface/groupsort.pm 2004/05/10 08:34:50 1.27
@@ -2,7 +2,7 @@
# The LON-CAPA group sort handler
# Allows for sorting prior to import into RAT.
#
-# $Id: groupsort.pm,v 1.15 2002/08/27 12:18:13 www Exp $
+# $Id: groupsort.pm,v 1.27 2004/05/10 08:34:50 taceyjo1 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,10 +38,21 @@ 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;
@@ -54,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=(<<ENDSMP);
function finish_import() {
opener.document.forms.simpleedit.importdetail.value='';
@@ -132,7 +141,6 @@ function orderchange(val,newval) {
</script>
</head>
END
- $r->print(&Apache::loncommon::bodytag('Sort Imported Resources'));
# read pertinent machine configuration
my $domain = $r->dir_config('lonDefDomain');
$iconpath = $r->dir_config('lonIconsURL') . "/";
@@ -144,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
@@ -160,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];
@@ -227,7 +235,10 @@ 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'}) {
@@ -283,8 +294,20 @@ END
untie %hash;
my $ctr = 0;
my $clen = scalar(keys %shash);
- $r->print(<<END);
-<b><font color="#888888">Finalize order of resources</font></b>
+ 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(<<END);
+<b><font color="#888888">$lt{'fin'}</font></b>
<form method='post' action='/adm/groupsort' name='groupsort'
enctype='application/x-www-form-urlencoded'>
<input type="hidden" name="fnum" value="$clen" />
@@ -293,53 +316,75 @@ END
<input type="hidden" name="mode" value="$ENV{'form.mode'}" />
END
-# --- Expand here if "GO BACK" button desired
- if ($ENV{'form.catalogmode'} eq 'groupimport') {
- $r->print(<<END);
-<input type="button" name="alter" value="GO BACK"
+ # --- Expand here if "GO BACK" button desired
+ if ($ENV{'form.catalogmode'} eq 'groupimport') {
+ $r->print(<<END);
+<input type="button" name="alter" value="$lt{'gb'}"
onClick="window.location='/res/?catalogmode=groupimport'" />
END
- }
- if ($ENV{'form.catalogmode'} eq 'groupsearch') {
- $r->print(<<END);
-<input type="button" name="alter" value="GO BACK"
- onClick="window.location='/adm/searchcat?catalogmode=groupsearch'" />
+ }
+ if ($ENV{'form.catalogmode'} eq 'groupsearch') {
+ $r->print(<<END);
+<input type="button" name="alter" value="$lt{'ns'}"
+ onClick="window.location='/adm/searchcat?catalogmode=groupsearch&cleargroupsort=1'" />
END
-}
-# ---
+ }
+ # ---
- $r->print(<<END);
-<input type="button" name="alter" value="FINISH IMPORT"
+ $r->print(<<END);
+<input type="button" name="alter" value="$lt{'fi'}"
onClick="finish_import()" />
-<input type="button" name="alter" value="CANCEL" onClick="self.close()" />
+<input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
END
- $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");
- $r->print("<table border=0><tr>\n");
- $r->print("<td colspan='2' bgcolor='$titleclr'><b>Change order</b></td>".
- "\n");
- $r->print("<td colspan='2' bgcolor='$titleclr'><b>Title</b></td>\n");
- $r->print("<td bgcolor='$titleclr'><b>Path</b></td></tr>\n");
+ $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");
+ $r->print("<table border=0><tr>\n");
+ $r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'co'}</b></td>\n");
+ $r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'ti'}</b></td>\n");
+ $r->print("<td bgcolor='$titleclr'><b>$lt{'pa'}</b></td></tr>\n");
+ } else {
+ $r->print(<<END);
+<body>
+<form method='post' action='/adm/groupsort' name='groupsort'
+ enctype='application/x-www-form-urlencoded'>
+<input type="hidden" name="fnum" value="$clen" />
+<input type="hidden" name="oldval" value="" />
+<input type="hidden" name="newval" value="" />
+<input type="hidden" name="mode" value="$ENV{'form.mode'}" />
+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("<tr><td bgcolor='$fileclr'>");
- $r->print(&movers($clen,$ctr));
+ my $iconname=&Apache::loncommon::icon($key);
+ if ($clen > 1) {
+ $r->print("<tr><td bgcolor='$fileclr'>");
+ $r->print(&movers($clen,$ctr));
+ }
$r->print(&hidden($ctr-1,$thash{$key},$key));
- $r->print("</td><td bgcolor='$fileclr'>");
- $r->print(&select_box($clen,$ctr));
- $r->print("</td><td bgcolor='$fileclr'>");
- $r->print("<img src='$iconpath$curfext.gif'>");
- $r->print("</td><td bgcolor='$fileclr'>");
- $r->print("$thash{$key}</td><td bgcolor='$fileclr'>\n");
- $r->print("$key</td></tr>\n");
- }
- $r->print("</table></td></tr></table></form>");
+ if ($clen > 1) {
+ $r->print("</td><td bgcolor='$fileclr'>");
+ $r->print(&select_box($clen,$ctr));
+ $r->print("</td><td bgcolor='$fileclr'>");
+ $r->print("<img src='$iconname' />");
+ $r->print("</td><td bgcolor='$fileclr'>");
+ $r->print("$thash{$key}</td><td bgcolor='$fileclr'>\n");
+ $r->print("$key</td></tr>\n");
+ }
+ }
+ if ($clen > 1) {
+ $r->print("</table></td></tr></table></form>");
+ } else {
+ $r->print(<<END);
+<script type="text/javascript">
+ finish_import();
+</script>
+END
+ }
$r->print(<<END);
</body>
</html>
END
+
return OK;
}