--- loncom/interface/lonindexer.pm 2007/06/27 23:27:23 1.163 +++ loncom/interface/lonindexer.pm 2007/07/18 13:39:31 1.173 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.163 2007/06/27 23:27:23 banghart Exp $ +# $Id: lonindexer.pm,v 1.173 2007/07/18 13:39:31 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -53,6 +53,7 @@ use Apache::lonmeta; use Apache::File; use Apache::lonlocal; use Apache::lonsource(); +use Apache::groupsort(); use GDBM_File; use LONCAPA qw(:match); @@ -128,7 +129,6 @@ sub handler { if ($env{'form.launch'} eq '1') { &start_fresh_session(\%dbfile); } - while(my($key,$value)=each(%dbfile)) { $hash{$key}=$value; } @@ -242,7 +242,7 @@ END # # if (!defined($mode) || ($mode ne 'edit' && $mode ne 'parmset')) { - my $location = "/adm/groupsort?catalogmode=import&"; + my $location = "/adm/groupsort?&inhibitmenu=yes&catalogmode=import&"; $location .= "mode=".$mode."&"; $location .= "acts="; $catalogmodefunctions=<<"END"; @@ -269,6 +269,9 @@ END function select_data(url) { var location = "/res/?launch=2&form=$form&element=$element&titleelement=$titleelement&acts=" + url; window.location=location; + if (window.opener.document.forms["$form"].elements["$element"].value != url) { + window.opener.unClean(); + } } function select_group() { window.location="$location"+document.forms.fileattr.acts.value; @@ -346,7 +349,9 @@ function queue(val) { END } + my $inhibit_menu = "+'&".&Apache::loncommon::inhibit_menu_check()."'"; # ---------------------------------------------------------------- Print Header + my $js = <<"ENDHEADER"; ENDHEADER @@ -396,44 +403,7 @@ ENDHEADER {'domain' => $headerdom,})); # - Evaluate actions from previous page (both cumulatively and chronologically) if ($env{'form.catalogmode'} eq 'import') { - 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 (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'}}; - } - } - } - # deleting the previously cached listing - foreach (keys %hash) { - if ($_ =~ /^pre_/ && $_ =~/link$/) { - my $key = $_; - $key =~ s/^pre_//; - $key =~ s/_[^_]*$//; - delete $hash{'pre_'.$key.'_title'}; - delete $hash{'pre_'.$key.'_link'}; - } - } + &Apache::groupsort::update_actions_hash(\%hash); } # ---------------------------------- get state of file attributes to be showing @@ -498,6 +468,7 @@ ENDHEADER $closebutton $groupimportbutton END + $r->print(&Apache::loncommon::inhibit_menu_check('input')); # -------------- Filter out sequence containment in crumbs and "recent folders" my $storeuri=$uri; $storeuri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1]; @@ -513,7 +484,7 @@ END if ($reshome) { $r->print("print('javascript:document.forms.fileattr.action="'.$reshome.'";document.forms.fileattr.submit();'); + $r->print('javascript:document.forms.fileattr.action="'.&Apache::loncommon::inhibit_menu_check($reshome).'";document.forms.fileattr.submit();'); } else { $r->print($reshome); } @@ -524,8 +495,10 @@ END &Apache::loncommon::storeresurl($storeuri); &Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri); # -------------------------------------------------- Check All and Uncheck all - $r->print('
'); - $r->print(''); + if ($env{'form.catalogmode'} eq 'import') { + $r->print('
'); + $r->print(''); + } # ----------------- output starting row to the indexed file/directory hierarchy my $titleclr="#ddffff"; #$r->print(&initdebug()); @@ -847,6 +820,7 @@ sub display_line { 'document.forms.fileattr.acts.value)" '. 'enctype="application/x-www-form-urlencoded"'. '>'."\n"); + $r->print(&Apache::loncommon::inhibit_menu_check('input')); $r->print (''."\n"); $r->print (''."\n"); @@ -920,7 +894,11 @@ sub display_line { # display file if (($fnptr == 0 and $filecom[3] ne '') or $absolute) { + my $title; my $filelink = $pathprefix.$filecom[0]; + if ($hash{'display_attrs_0'} == 1) { + $title = &Apache::lonnet::gettitle($filelink); + } my @file_ext = split (/\./,$listname); my $curfext = $file_ext[-1]; if (@Omit) { @@ -953,6 +931,10 @@ sub display_line { $r->print(" />\n"); $r->print(""); $hash{"pre_${fnum}_link"}=$filelink; + $hash{"pre_${fnum}_title"}=$title; + if (!$hash{"pre_${fnum}_title"}) { + $hash{"pre_${fnum}_title"} = 'Not_retrieved'; + } $fnum++; } # Form to open or close sequences @@ -992,13 +974,13 @@ sub display_line { $r->print("\"\"\n"); my $quotable_filelink = &Apache::loncommon::escape_single($filelink); - $r->print (" $listname "); - + $quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta'); + &Apache::loncommon::inhibit_menu_check(\$quotable_filelink); $r->print (" (metadata) "); # Close form to open/close sequence if ($filelink=~/\.(page|sequence)$/) { @@ -1006,7 +988,6 @@ sub display_line { } $r->print("\n"); if ($hash{'display_attrs_0'} == 1) { - my $title = &Apache::lonnet::gettitle($filelink,'title'); $r->print(' '.($title eq '' ? ' ' : $title). ' '."\n"); } @@ -1062,6 +1043,7 @@ sub display_line { if($source eq 'open') { my $sourcelink = &Apache::lonsource::make_link($filelink,$listname); my $quotable_sourcelink = &Apache::loncommon::escape_single($sourcelink); + &Apache::loncommon::inhibit_menu_check(\$quotable_sourcelink); $r->print(''."print(' '.($title eq '' ? ' ' : $title). ' '."\n"); } @@ -1259,6 +1241,7 @@ sub begin_form { $r->print (''. "\n"); $r->print (''."\n"); + $r->print(&Apache::loncommon::inhibit_menu_check('input')); $dnum++; }