--- loncom/interface/groupsort.pm 2006/09/12 22:13:05 1.49 +++ loncom/interface/groupsort.pm 2007/07/12 01:04:36 1.58 @@ -2,7 +2,7 @@ # The LON-CAPA group sort handler # Allows for sorting prior to import into RAT. # -# $Id: groupsort.pm,v 1.49 2006/09/12 22:13:05 albertel Exp $ +# $Id: groupsort.pm,v 1.58 2007/07/12 01:04:36 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,105 +37,94 @@ use GDBM_File; use Apache::loncommon; use Apache::lonlocal; use Apache::lonnet; +use LONCAPA(); my $iconpath; # variable to be accessible to multiple subroutines my %hash; # variable to tie to user specific database +sub update_actions_hash { + my ($hash) = @_; + my $acts=$env{'form.acts'}; + my @Acts=split(/b/,$acts); + my %ahash; + my %achash; + my $ac=0; + # some initial hashes for working with data + 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'}}); + } + } + } + # 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,$shash,$thash)=@_; + 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)) { - 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') { - $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'}}; - } - } + &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); } - foreach (keys %hash) { - if ($_ =~ /^store_/) { - my $key = $_; - $key =~ s/^store_//; - $$shash{$key} = $hash{'storectr_'.$key}; - if (&Apache::lonnet::gettitle($key) eq '') { - $$thash{$key} = $hash{'store_'.$key}; - } else { - $$thash{$key} = &Apache::lonnet::gettitle($key); - } - } + + # 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 $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; - } - } + 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; - return ($shash,$thash); + untie(%hash); } @@ -153,7 +142,7 @@ sub cleanup { # -------------------------------------------------------------- Read from file sub readfromfile { - my ($r,$shash,$thash,$nhash)=@_; + my ($r,$resources)=@_; my $cont=&Apache::lonnet::getfile (&Apache::lonnet::filelocation('',$env{'form.readfile'})); if ($cont==-1) { @@ -162,7 +151,6 @@ sub readfromfile { } 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') { @@ -172,43 +160,42 @@ sub readfromfile { if ($token->[2]->{'type'} eq 'zombie') { next; } } - my $url=$token->[2]->{'src'}; my $name=$token->[2]->{'title'}; - $name=~s/ \[\((\d+)\,(\w+)\,(\w+)\)\]$//; + $name=~s/ \[\((\d+)\,($LONCAPA::username_re)\,($LONCAPA::domain_re)\)\]$//; + my $note; if ($1) { - $$nhash{$url}='
'.&mt('Removed by '). + $note = '
'.&mt('Removed by '). &Apache::loncommon::plainname($2,$3).', '. &Apache::lonlocal::locallocaltime($1); } $name=~s/\&colon\;/\:/g; - $$thash{$url}=$name; - $$shash{$url}=$n; - $n++; + push(@{$resources}, {'url' => $token->[2]->{'src'}, + 'title' => $name, + 'note' => $note, + 'id' => $token->[2]->{'id'},}); } } } } - return ($shash,$thash); } # --------------------------------------------------------- Read from bookmarks sub readfrombookmarks { - my ($r,$shash,$thash)=@_; + 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); - my $order=1; for (my $index=0;$index<($#bookmarks+1)/2;$index++) { if ($bookmarks[$index*2+1]) { - $$thash{$bookmarks[$index*2+1]}=$bookmarks[$index*2]; - $$thash{$bookmarks[$index*2+1]}=~s/^LON\-CAPA\s+//; - $$shash{$bookmarks[$index*2+1]}=$order; - $order++; + my $url = $bookmarks[$index*2+1]; + my $name = $bookmarks[$index*2]; + $name =~ s/^LON\-CAPA\s+//; + + push(@{$resources},{'url' => $url, 'title' => $name}); } } - return ($shash,$thash); } # ---------------------------------------------------------------- Main Handler @@ -241,7 +228,8 @@ function finish_import() { $begincondition opener.document.forms.simpleedit.importdetail.value+='&'+ escape(eval("document.forms.groupsort.title"+num+".value"))+'='+ - escape(eval("document.forms.groupsort.filelink"+num+".value")); + escape(eval("document.forms.groupsort.filelink"+num+".value"))+'='+ + escape(eval("document.forms.groupsort.id"+num+".value")); $endcondition } opener.document.forms.simpleedit.submit(); @@ -307,36 +295,36 @@ END 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); + my @resources; if ($env{'form.readfile'}) { - &readfromfile($r,\%shash,\%thash,\%nhash); + &readfromfile($r,\@resources); } elsif ($env{'form.bookmarks'}) { - &readfrombookmarks($r,\%shash,\%thash); + &readfrombookmarks($r,\@resources); } else { - &readfromdb($r,\%shash,\%thash); + &readfromdb($r,\@resources); } my $ctr = 0; - my $clen = scalar(keys %shash); + my $clen = scalar(@resources); if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { my %lt=&Apache::lonlocal::texthash( 'fin'=> 'Finalize order of resources', 'ci' => 'Continue Import', 'cs' => 'Continue Search', 'fi' => 'Finish Import', + 're' => 'Recover Checked', 'ca' => 'Cancel', 'co' => 'Change Order', 'ti' => 'Title', 'pa' => 'Path', 'in' => 'Include' ); - $r->print(&Apache::loncommon::start_page('Sort Imported Resources', - $js)); + my $title = ($env{'form.recover'}) ? 'Recover Removed Resources' + : 'Sort Imported Resources'; + $r->print(&Apache::loncommon::start_page($title, $js)); + $r->print(<$lt{'fin'}
@@ -348,22 +336,30 @@ END END + $r->print(&Apache::loncommon::inhibit_menu_check('input')); + # --- + + if ($env{'form.recover'}) { + $r->print(<  + +END + } else { # --- Continue Buttons - my $resurl = - &Apache::loncommon::escape_single(&Apache::loncommon::lastresurl()); - $r->print(<print(<$lt{'fin'}   + onClick="window.location='$resurl?inhibitmenu=yes&catalogmode=import'" />    -END - # --- - - $r->print(<    END + } $r->print("
"); $r->print("\n"); if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { @@ -384,11 +380,12 @@ END END + $r->print(&Apache::loncommon::inhibit_menu_check('input')); + } - foreach (sort {$shash{$a}<=>$shash{$b}} (keys %shash)) { - my $key=$_; + foreach my $resource (@resources) { $ctr++; - my $iconname=&Apache::loncommon::icon($key); + my $iconname=&Apache::loncommon::icon($resource->{'url'}); if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { $r->print(""); unless (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { @@ -408,8 +406,8 @@ END $r->print("\n"); + $r->print($resource->{'title'}.$resource->{'notes'}."\n"); } } if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { @@ -429,12 +427,13 @@ END # --------------------------------------- Hidden values (returns scalar string) sub hidden { - my ($sel,$title,$filelink) = @_; + my ($sel,$title,$filelink,$id) = @_; my $string = ''; $filelink=~s|^/ext/|http://|; $string .= ''; + $string .= ''; return $string; }
"); if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { @@ -397,7 +394,8 @@ END $r->print(&movers($clen,$ctr)); } } - $r->print(&hidden($ctr-1,$thash{$key},$key)); + $r->print(&hidden($ctr-1,$resource->{'title'},$resource->{'url'}, + $resource->{'id'})); if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { $r->print(""); $r->print(""); $r->print(""); - $r->print("$thash{$key}$nhash{$key}\n"); - $r->print("$key
\n"); + $r->print($resource->{'url'}."