--- loncom/interface/groupsort.pm 2006/03/26 19:44:45 1.41 +++ loncom/interface/groupsort.pm 2006/07/28 20:01:26 1.47 @@ -2,7 +2,7 @@ # The LON-CAPA group sort handler # Allows for sorting prior to import into RAT. # -# $Id: groupsort.pm,v 1.41 2006/03/26 19:44:45 banghart Exp $ +# $Id: groupsort.pm,v 1.47 2006/07/28 20:01:26 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 $diropendb = + "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db"; - my $newest=0; - $diropendb=''; - for (my $i=0; $i<=$#dbfn; $i++) { - if ($dbst[$i]>$newest) { - $newest=$dbst[$i]; - $diropendb=$dbfn[$i]; - } - } - - } # ----------------------------- 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'}} = @@ -239,12 +191,32 @@ sub readfromfile { return ($shash,$thash); } +# --------------------------------------------------------- Read from bookmarks + +sub readfrombookmarks { + my ($r,$shash,$thash)=@_; + 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++; + } + } + return ($shash,$thash); +} + # ---------------------------------------------------------------- Main Handler sub handler { my $r = shift; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['acts','catalogmode','mode','readfile','recover']); + ['acts','mode','readfile','recover','bookmarks']); # color scheme my $fileclr = '#ffffe6'; my $titleclr = '#ddffff'; @@ -257,7 +229,7 @@ sub handler { my $finishimport=''; my $begincondition=''; my $endcondition=''; - if ($env{'form.readfile'}) { + if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { $begincondition='if (eval("document.forms.groupsort.include"+num+".checked")) {'; $endcondition='}'; } @@ -341,17 +313,19 @@ END if ($env{'form.readfile'}) { &readfromfile($r,\%shash,\%thash,\%nhash); + } elsif ($env{'form.bookmarks'}) { + &readfrombookmarks($r,\%shash,\%thash); } else { &readfromdb($r,\%shash,\%thash); } my $ctr = 0; my $clen = scalar(keys %shash); - if (($clen > 1) || ($env{'form.readfile'})) { + if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { 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', @@ -370,23 +344,18 @@ END + 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("
"); $r->print("\n"); - if ($env{'form.readfile'}) { + if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { $r->print("\n"); } else { $r->print("\n"); @@ -419,18 +388,18 @@ END my $key=$_; $ctr++; my $iconname=&Apache::loncommon::icon($key); - if (($clen > 1) || ($env{'form.readfile'})) { + if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { $r->print(""); - unless ($env{'form.readfile'}) { + unless (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { $r->print(""); @@ -442,7 +411,7 @@ END $r->print("$key\n"); } } - if (($clen > 1) || ($env{'form.readfile'})) { + if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { $r->print("
$lt{'in'}$lt{'co'}
"); - if ($env{'form.readfile'}) { + if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { $r->print(&checkbox($ctr-1)); } else { $r->print(&movers($clen,$ctr)); } } $r->print(&hidden($ctr-1,$thash{$key},$key)); - if (($clen > 1) || ($env{'form.readfile'})) { + if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { $r->print("". &select_box($clen,$ctr). "
"); } else { $r->print(<