--- loncom/interface/groupsort.pm 2003/06/14 00:15:01 1.21
+++ loncom/interface/groupsort.pm 2008/12/01 19:12:37 1.63
@@ -2,7 +2,7 @@
# The LON-CAPA group sort handler
# Allows for sorting prior to import into RAT.
#
-# $Id: groupsort.pm,v 1.21 2003/06/14 00:15:01 albertel Exp $
+# $Id: groupsort.pm,v 1.63 2008/12/01 19:12:37 jms Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,9 +26,6 @@
#
# http://www.lon-capa.org/
#
-# YEAR=2001
-# YEAR=2002
-#
###
package Apache::groupsort;
@@ -38,9 +35,101 @@ use strict;
use Apache::Constants qw(:common);
use GDBM_File;
use Apache::loncommon;
+use Apache::lonlocal;
+use Apache::lonnet;
+use LONCAPA;
-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 update_actions_hash {
+ my ($hash) = @_;
+ # be careful in here, there is also a global %hash
+ my $acts=$env{'form.acts'};
+ my @Acts=split(/b/,$acts);
+ my %ahash;
+ my %achash;
+ # some initial hashes for working with data
+ my $ac=0;
+ foreach (@Acts) {
+ my ($state,$ref)=split(/a/);
+ $ahash{$ref}=$state;
+ $achash{$ref}=$ac;
+ $ac++;
+ }
+ # sorting through the actions and changing the global database hash
+ foreach my $key (sort {$achash{$a}<=>$achash{$b}} (keys %ahash)) {
+ if ($ahash{$key} eq '1') {
+ $hash->{'store_'.$hash->{'pre_'.$key.'_link'}}=
+ $hash->{'pre_'.$key.'_title'};
+ $hash->{'storectr_'.$hash->{'pre_'.$key.'_link'}}=
+ $hash->{'storectr'}+0;
+ $hash->{'storectr'}++;
+ }
+ if ($ahash{$key} eq '0') {
+ if ($hash->{'store_'.$hash->{'pre_'.$key.'_link'}}) {
+ delete($hash->{'store_'.$hash->{'pre_'.$key.'_link'}});
+ delete($hash->{'storectr_'.$hash->{'pre_'.$key.'_link'}});
+ }
+ }
+ }
+ # deleting the previously cached listing
+ foreach my $key (keys(%{ $hash })) {
+ next if ($key !~ /^pre_(\d+)_link/);
+ my $which = $1;
+ delete($hash->{'pre_'.$which.'_title'});
+ delete($hash->{'pre_'.$which.'_link'});
+ }
+}
+
+sub readfromdb {
+ my ($r,$resources)=@_;
+
+ 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)) {
+ &update_actions_hash(\%hash);
+
+ my %temp_resources;
+ foreach my $key (keys(%hash)) {
+ next if ($key !~ /^store_/);
+ my ($url) = ($key =~ /^store_(.*)/);
+ $temp_resources{$hash{'storectr_'.$url}}{'url'}=$url;
+ $temp_resources{$hash{'storectr_'.$url}}{'title'}=
+ &Apache::lonnet::gettitle($url);
+ }
+
+ # use the temp, since there might be gaps in the counting
+ foreach my $item (sort {$a <=> $b} (keys(%temp_resources))) {
+ push(@{ $resources },$temp_resources{$item});
+ }
+
+ if ($env{'form.oldval'}) {
+ my $res = splice(@{$resources},$env{'form.oldval'}-1,1);
+ if ($env{'form.newval'} == 0) {
+ # picked 'discard'
+ my $url = $res->{'url'};
+ delete($hash{'storectr_'.$url});
+ delete($hash{'store_'.$url});
+ } else {
+ splice(@{$resources},$env{'form.newval'}-1,0,$res);
+ }
+ }
+ # store out new order
+ foreach my $which (0..$#$resources) {
+ my $url = $resources->[$which]{'url'};
+ $hash{'storectr_'.$url} = $which;
+ }
+ } else {
+ $r->print('Unable to tie hash to db file');
+ }
+ untie(%hash);
+}
+
+
sub cleanup {
if (tied(%hash)){
@@ -49,6 +138,66 @@ sub cleanup {
&Apache::lonnet::logthis('Failed cleanup groupsort: hash');
}
}
+ return OK;
+}
+
+# -------------------------------------------------------------- Read from file
+
+sub readfromfile {
+ my ($r,$resources)=@_;
+ 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;
+ 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 $name=$token->[2]->{'title'};
+ $name=~s/ \[\((\d+)\,($LONCAPA::username_re)\,($LONCAPA::domain_re)\)\]$//;
+ my $note;
+ if ($1) {
+ $note = '
'.&mt('Removed by ').
+ &Apache::loncommon::plainname($2,$3).', '.
+ &Apache::lonlocal::locallocaltime($1);
+ }
+ $name=~s/\&colon\;/\:/g;
+ push(@{$resources}, {'url' => $token->[2]->{'src'},
+ 'title' => $name,
+ 'note' => $note,
+ 'id' => $token->[2]->{'id'},});
+ }
+ }
+ }
+ }
+}
+
+# --------------------------------------------------------- Read from bookmarks
+
+sub readfrombookmarks {
+ my ($r,$resources)=@_;
+ my %bookmarks=&Apache::lonnet::dump('bookmarks');
+# the bookmark "hash" is just one entry
+# it's a javascript program code with arguments like ('title','url');
+ my @bookmarks=($bookmarks{'bookmarks'}=~/\((?:\'([^\']+)\'\,\'([^\']+)\'|\"([^\"]+)\"\,\"([^\"]+)\")\)\;/g);
+ for (my $index=0;$index<($#bookmarks+1)/2;$index++) {
+ if ($bookmarks[$index*2+1]) {
+ my $url = $bookmarks[$index*2+1];
+ my $name = $bookmarks[$index*2];
+ $name =~ s/^LON\-CAPA\s+//;
+
+ push(@{$resources},{'url' => $url, 'title' => $name});
+ }
+ }
}
# ---------------------------------------------------------------- Main Handler
@@ -56,25 +205,31 @@ sub handler {
my $r = shift;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['acts','catalogmode','mode']);
- # color scheme
- my $fileclr = '#ffffe6';
- my $titleclr = '#ddffff';
+ ['acts','mode','readfile','recover','bookmarks']);
- $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') {
+ my $begincondition='';
+ my $endcondition='';
+ if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
+ $begincondition='if (eval("document.forms.groupsort.include"+num+".checked")) {';
+ $endcondition='}';
+ }
+ if ($env{'form.mode'} eq 'simple' || $env{'form.mode'} eq '') {
$finishimport=(<
+ my $js = <
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');
+function placeResourceInLastRow (title,url,id,linkflag) {
+ opener.mostrecent=opener.newresource(opener.maxrow,2,opener.escape(title),
+ opener.escape(url),'false','normal',id);
opener.save();
- opener.mostrecent=opener.obj.length-1;
if (linkflag) {
opener.joinres(opener.linkmode,opener.mostrecent,0);
}
@@ -137,231 +290,159 @@ function orderchange(val,newval) {
document.forms.groupsort.submit();
}
-
END
- $r->print(&Apache::loncommon::bodytag('Sort Imported Resources'));
# 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 $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";
- }
-# --------------------- 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";
- $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 @resources;
- }
-# ----------------------------- 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;
- my $ac = 0;
- foreach (@Acts) {
- my ($state,$ref) = split(/a/);
- $ahash{$ref} = $state;
- $achash{$ref} = $ac;
- $ac++;
- }
- 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'}} =
- $hash{'storectr'}+0;
- $hash{'storectr'}++;
- }
- if ($ahash{$key} eq '0') {
- if ($hash{'store_'.$hash{'pre_'.$key.'_link'}}) {
- delete $hash{'store_'.$hash{'pre_'.$key.'_link'}};
- }
- }
- }
- foreach (keys %hash) {
- if ($_ =~ /^store_/) {
- my $key = $_;
- $key =~ s/^store_//;
- $shash{$key} = $hash{'storectr_'.$key};
- $thash{$key} = $hash{'store_'.$key};
- }
- }
- if ($ENV{'form.oldval'}) {
- my $newctr = 0;
- my %chash;
- foreach (sort {$shash{$a} <=> $shash{$b}} (keys %shash)) {
- my $key = $_;
- $newctr++;
- $shash{$key} = $newctr;
- $hash{'storectr_'.$key} = $newctr;
- $chash{$newctr} = $key;
- }
- 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;
- $hash{'storectr_'.$chash{$oldval}} = $newval;
- }
- 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;
- $hash{'storectr_'.$chash{$idx+1}} = $idx;
- }
- delete $shash{$chash{$oldval}};
- delete $hash{'storectr_'.$chash{$oldval}};
- delete $hash{'store_'.$chash{$oldval}};
- }
- elsif ($oldval < $newval) { # push down
- for my $idx ($oldval..($newval-1)) {
- $shash{$chash{$idx+1}} = $idx;
- $hash{'storectr_'.$chash{$idx+1}} = $idx;
- }
- }
- elsif ($oldval > $newval) { # push up
- for my $idx (reverse($newval..($oldval-1))) {
- $shash{$chash{$idx}} = $idx+1;
- $hash{'storectr_'.$chash{$idx}} = $idx+1;
- }
- }
- }
- }
+ if ($env{'form.readfile'}) {
+ &readfromfile($r,\@resources);
+ } elsif ($env{'form.bookmarks'}) {
+ &readfrombookmarks($r,\@resources);
} else {
- $r->print('Unable to tie hash to db file