--- loncom/interface/groupsort.pm 2004/07/12 20:42:31 1.29
+++ loncom/interface/groupsort.pm 2005/06/10 15:17:35 1.35
@@ -2,7 +2,7 @@
# The LON-CAPA group sort handler
# Allows for sorting prior to import into RAT.
#
-# $Id: groupsort.pm,v 1.29 2004/07/12 20:42:31 matthew Exp $
+# $Id: groupsort.pm,v 1.35 2005/06/10 15:17:35 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,9 +26,6 @@
#
# http://www.lon-capa.org/
#
-# YEAR=2001
-# YEAR=2002
-#
###
package Apache::groupsort;
@@ -41,146 +38,43 @@ 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
+my %hash; # variable to tie to user specific database
-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';
-
- &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' || $ENV{'form.mode'} eq '') {
- $finishimport=(<<ENDSMP);
-function finish_import() {
- opener.document.forms.simpleedit.importdetail.value='';
- for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
- opener.document.forms.simpleedit.importdetail.value+='&'+
- escape(eval("document.forms.groupsort.title"+num+".value"))+'='+
- escape(eval("document.forms.groupsort.filelink"+num+".value"));
- }
- opener.document.forms.simpleedit.submit();
- self.close();
-}
-ENDSMP
- } else {
- $finishimport=(<<ENDADV);
-function finish_import() {
- var linkflag=false;
- for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
- insertRowInLastRow();
- placeResourceInLastRow(
- eval("document.forms.groupsort.title"+num+".value"),
- eval("document.forms.groupsort.filelink"+num+".value"),
- linkflag
- );
- linkflag=true;
- }
- opener.editmode=0;
- opener.notclear=0;
- opener.linkmode=0;
- opener.draw();
- self.close();
-}
-ENDADV
- }
-
-# output start of web page
-
- $r->print(<<END);
-<html>
-<head>
-<title>The LearningOnline Network With CAPA Group Sorter</title>
-<script language='javascript'>
-function insertRowInLastRow() {
- opener.insertrow(opener.maxrow);
- opener.addobj(opener.maxrow,'e&2');
-}
-function placeResourceInLastRow (title,url,linkflag) {
- opener.newresource(opener.maxrow,2,opener.escape(title),
- opener.escape(url),'false','normal');
- opener.save();
- opener.mostrecent=opener.obj.length-1;
- if (linkflag) {
- opener.joinres(opener.linkmode,opener.mostrecent,0);
- }
- opener.linkmode=opener.mostrecent;
-}
-$finishimport
-function selectchange(val) {
- var newval=0+eval("document.forms.groupsort.alt"+val+".selectedIndex");
- orderchange(val,newval);
-}
-function move(val,newval) {
- orderchange(val,newval);
-}
-function orderchange(val,newval) {
- document.forms.groupsort.oldval.value=val;
- document.forms.groupsort.newval.value=newval;
- document.forms.groupsort.submit();
-}
-</script>
-</head>
-END
- # read pertinent machine configuration
- my $domain = $r->dir_config('lonDefDomain');
- $iconpath = $r->dir_config('lonIconsURL') . "/";
- my %shash; # sort order (key is resource location, value is sort order)
- my %thash; # title (key is resource location, value is title)
+sub readfromdb {
+ my ($r,$shash,$thash)=@_;
my $diropendb;
# ------------------------------ which file do we open? Easy if explictly given
- if ($ENV{'form.catalogmode'} eq 'groupsearch') {
+ 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') {
+ "/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') {
+ "/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";
- }
+ "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_groupsec.db";
+ } else {
# --------------------- not explicitly given, choose the one most recently used
- else { # choose last accessed
my @dbfn;
my @dbst;
$dbfn[0] =
- "/home/httpd/perl/tmp/$ENV{'user.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/$ENV{'user.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/$ENV{'user.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];
@@ -202,7 +96,7 @@ END
}
# ----------------------------- 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 = $env{'form.acts'};
my @Acts = split(/b/,$acts);
my %ahash;
my %achash;
@@ -234,65 +128,216 @@ END
if ($_ =~ /^store_/) {
my $key = $_;
$key =~ s/^store_//;
- $shash{$key} = $hash{'storectr_'.$key};
+ $$shash{$key} = $hash{'storectr_'.$key};
if (&Apache::lonnet::gettitle($key) eq '') {
- $thash{$key} = $hash{'store_'.$key};
+ $$thash{$key} = $hash{'store_'.$key};
} else {
- $thash{$key} = &Apache::lonnet::gettitle($key);
+ $$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)) {
+ foreach (sort {$$shash{$a} <=> $$shash{$b}} (keys %{$shash})) {
my $key = $_;
$newctr++;
- $shash{$key} = $newctr;
+ $$shash{$key} = $newctr;
$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) {
- $shash{$chash{$oldval}} = $newval;
+ $$shash{$chash{$oldval}} = $newval;
$hash{'storectr_'.$chash{$oldval}} = $newval;
- }
- else {
- $shash{$chash{$oldval}} = $newctr;
+ } else {
+ $$shash{$chash{$oldval}} = $newctr;
$hash{'storectr_'.$chash{$oldval}} = $newctr;
}
if ($newval==0) { # push down
my $newval2=$newctr;
for my $idx ($oldval..($newval2-1)) {
- $shash{$chash{$idx+1}} = $idx;
+ $$shash{$chash{$idx+1}} = $idx;
$hash{'storectr_'.$chash{$idx+1}} = $idx;
}
- delete $shash{$chash{$oldval}};
+ delete $$shash{$chash{$oldval}};
delete $hash{'storectr_'.$chash{$oldval}};
delete $hash{'store_'.$chash{$oldval}};
- }
- elsif ($oldval < $newval) { # push down
+ } elsif ($oldval < $newval) { # push down
for my $idx ($oldval..($newval-1)) {
- $shash{$chash{$idx+1}} = $idx;
+ $$shash{$chash{$idx+1}} = $idx;
$hash{'storectr_'.$chash{$idx+1}} = $idx;
}
- }
- elsif ($oldval > $newval) { # push up
+ } elsif ($oldval > $newval) { # push up
for my $idx (reverse($newval..($oldval-1))) {
- $shash{$chash{$idx}} = $idx+1;
+ $$shash{$chash{$idx}} = $idx+1;
$hash{'storectr_'.$chash{$idx}} = $idx+1;
}
}
}
}
} else {
- $r->print('Unable to tie hash to db file</body></html>');
- return OK;
+ $r->print('Unable to tie hash to db file');
}
untie %hash;
+ return ($shash,$thash);
+}
+
+
+
+sub cleanup {
+ if (tied(%hash)){
+ &Apache::lonnet::logthis('Cleanup groupsort: hash');
+ unless (untie(%hash)) {
+ &Apache::lonnet::logthis('Failed cleanup groupsort: hash');
+ }
+ }
+}
+
+# -------------------------------------------------------------- Read from file
+
+sub readfromfile {
+ my ($r,$shash,$thash,$nhash)=@_;
+ my $cont=&Apache::lonnet::getfile
+ (&Apache::lonnet::filelocation('',$env{'form.readfile'}));
+ if ($cont==-1) {
+ $r->print('Unable to read file: '.
+ &Apache::lonnet::filelocation('',$env{'form.readfile'}));
+ } else {
+ my $parser = HTML::TokeParser->new(\$cont);
+ my $token;
+ my $n=1;
+ while ($token = $parser->get_token) {
+ if ($token->[0] eq 'S') {
+ if ($token->[1] eq 'resource') {
+ if ($env{'form.recover'}) {
+ if ($token->[2]->{'type'} ne 'zombie') { next; }
+ } else {
+ if ($token->[2]->{'type'} eq 'zombie') { next; }
+ }
+
+ my $url=$token->[2]->{'src'};
+ my $name=$token->[2]->{'title'};
+ $name=~s/ \[\((\d+)\,(\w+)\,(\w+)\)\]$//;
+ if ($1) {
+ $$nhash{$url}='<br />'.&mt('Removed by ').
+ &Apache::loncommon::plainname($2,$3).', '.
+ &Apache::lonlocal::locallocaltime($1);
+ }
+ $$thash{$url}=$name;
+ $$shash{$url}=$n;
+ $n++;
+ }
+ }
+ }
+ }
+ return ($shash,$thash);
+}
+
+# ---------------------------------------------------------------- Main Handler
+sub handler {
+ my $r = shift;
+
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['acts','catalogmode','mode','readfile','recover']);
+ # color scheme
+ my $fileclr = '#ffffe6';
+ my $titleclr = '#ddffff';
+
+ &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' || $env{'form.mode'} eq '') {
+ $finishimport=(<<ENDSMP);
+function finish_import() {
+ opener.document.forms.simpleedit.importdetail.value='';
+ for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
+ opener.document.forms.simpleedit.importdetail.value+='&'+
+ escape(eval("document.forms.groupsort.title"+num+".value"))+'='+
+ escape(eval("document.forms.groupsort.filelink"+num+".value"));
+ }
+ opener.document.forms.simpleedit.submit();
+ self.close();
+}
+ENDSMP
+ } else {
+ $finishimport=(<<ENDADV);
+function finish_import() {
+ var linkflag=false;
+ for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
+ insertRowInLastRow();
+ placeResourceInLastRow(
+ eval("document.forms.groupsort.title"+num+".value"),
+ eval("document.forms.groupsort.filelink"+num+".value"),
+ linkflag
+ );
+ linkflag=true;
+ }
+ opener.editmode=0;
+ opener.notclear=0;
+ opener.linkmode=0;
+ opener.draw();
+ self.close();
+}
+ENDADV
+ }
+
+# output start of web page
+ my $html=&Apache::lonxml::xmlbegin();
+ $r->print(<<END);
+$html
+<head>
+<title>The LearningOnline Network With CAPA Group Sorter</title>
+<script language='javascript'>
+function insertRowInLastRow() {
+ opener.insertrow(opener.maxrow);
+ opener.addobj(opener.maxrow,'e&2');
+}
+function placeResourceInLastRow (title,url,linkflag) {
+ opener.mostrecent=opener.newresource(opener.maxrow,2,opener.escape(title),
+ opener.escape(url),'false','normal');
+ opener.save();
+ if (linkflag) {
+ opener.joinres(opener.linkmode,opener.mostrecent,0);
+ }
+ opener.linkmode=opener.mostrecent;
+}
+$finishimport
+function selectchange(val) {
+ var newval=0+eval("document.forms.groupsort.alt"+val+".selectedIndex");
+ orderchange(val,newval);
+}
+function move(val,newval) {
+ orderchange(val,newval);
+}
+function orderchange(val,newval) {
+ document.forms.groupsort.oldval.value=val;
+ document.forms.groupsort.newval.value=newval;
+ document.forms.groupsort.submit();
+}
+</script>
+</head>
+END
+ # read pertinent machine configuration
+ my $domain = $r->dir_config('lonDefDomain');
+ $iconpath = $r->dir_config('lonIconsURL') . "/";
+
+ my %shash; # sort order (key is resource location, value is sort order)
+ my %thash; # title (key is resource location, value is title)
+ my %nhash; # notes (key is resource location);
+
+ if ($env{'form.readfile'}) {
+ &readfromfile($r,\%shash,\%thash,\%nhash);
+ } else {
+ &readfromdb($r,\%shash,\%thash);
+ }
+
my $ctr = 0;
my $clen = scalar(keys %shash);
if ($clen > 1) {
@@ -314,18 +359,18 @@ END
<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'}" />
+<input type="hidden" name="mode" value="$env{'form.mode'}" />
END
# --- Expand here if "GO BACK" button desired
- if ($ENV{'form.catalogmode'} eq 'groupimport') {
+ if ($env{'form.catalogmode'} eq 'groupimport') {
my $resurl = &Apache::loncommon::lastresurl();
$r->print(<<END);
<input type="button" name="alter" value="$lt{'gb'}"
onClick="window.location='$resurl?catalogmode=groupimport'" />
END
}
- if ($ENV{'form.catalogmode'} eq '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'" />
@@ -351,7 +396,7 @@ END
<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'}" />
+<input type="hidden" name="mode" value="$env{'form.mode'}" />
END
}
foreach (sort {$shash{$a}<=>$shash{$b}} (keys %shash)) {