--- loncom/interface/lonindexer.pm 2007/06/26 23:06:17 1.160 +++ loncom/interface/lonindexer.pm 2009/08/13 13:23:26 1.181.4.3 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.160 2007/06/26 23:06:17 banghart Exp $ +# $Id: lonindexer.pm,v 1.181.4.3 2009/08/13 13:23:26 raeburn 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); @@ -105,7 +106,7 @@ sub handler { my $fileclr='#ffffe6'; my $line; - my (@attrchk,@openpath); + my (@attrchk,@openpath,$typeselect); my $uri=$r->uri; # -------------------------------------- see if called from an interactive mode @@ -128,13 +129,17 @@ sub handler { if ($env{'form.launch'} eq '1') { &start_fresh_session(\%dbfile); } - while(my($key,$value)=each(%dbfile)) { $hash{$key}=$value; } untie(%dbfile); } } +# - Evaluate actions from previous page (both cumulatively and chronologically) + if ($env{'form.catalogmode'} eq 'import' || $hash{'form.catalogmode'} eq 'import') { + &Apache::groupsort::update_actions_hash(\%hash); + } + { #Hijack lonindexer to verify a title and be close down. if ($env{'form.launch'} eq '2') { @@ -174,26 +179,26 @@ ENDSUBM if ($env{'form.catalogmode'} eq 'interactive') { $extrafield=''. ''; + ' class="LC_icon" />'; $colspan=" colspan='2' "; my $cl=&mt('Close'); $closebutton=< + END } elsif ($env{'form.catalogmode'} eq 'import') { $extrafield=''. ''; + ' class="LC_icon" />'; $colspan=" colspan='2' "; my $cl=&mt('Close'); my $gi=&mt('Import'); $closebutton=< + END $groupimportbutton=< +onclick="javascript:select_group()" /> END } # Additions made by Matthew to make the browser a little easier to deal @@ -242,7 +247,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 +274,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,20 +354,37 @@ function queue(val) { END } + my $inhibit_menu = "+'&".&Apache::loncommon::inhibit_menu_check()."'"; # ---------------------------------------------------------------- Print Header + my $js = <<"ENDHEADER"; ENDHEADER my ($headerdom)=($uri=~m{^/res/($match_domain)/}); - $r->print(&Apache::loncommon::start_page('Browse Resources',$js, - {'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'}; - } - } + my %args = ( + 'domain' => $headerdom, + ); + if ($env{'form.catalogmode'}) { + # "Popup mode" + $args{'only_body'} = 1; + } + $r->print(&Apache::loncommon::start_page('Browse Resources',$js,\%args)); +# ---------------------------------- get state of file types to be showing + if ($env{'form.only'}) { + $typeselect = $env{'form.only'}; + } else { + $typeselect = ''; } - + # ---------------------------------- get state of file attributes to be showing if ($env{'form.attrs'}) { - for (my $i=0; $i<=11; $i++) { + for (my $i=0; $i<=16; $i++) { delete $hash{'display_attrs_'.$i}; if ($env{'form.attr'.$i} == 1) { - $attrchk[$i] = 'checked'; + $attrchk[$i] = 'checked="checked"'; $hash{'display_attrs_'.$i} = 1; } } } else { - for (my $i=0; $i<=11; $i++) { - $attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1; + for (my $i=0; $i<=16; $i++) { + $attrchk[$i] = 'checked="checked"' if $hash{'display_attrs_'.$i} == 1; } } @@ -452,42 +448,80 @@ ENDHEADER 'st' => 'Statistics', 'au' => 'Author', 'kw' => 'Keywords', + 'sb' => 'Subject', + 'nt' => 'Notes', + 'ab' => 'Abstract', 'ln' => 'Language', + 'gl' => 'Grade Level', + 'sd' => 'Standards', 'sa' => 'Source Available', 'sr' => 'Show resource', 'li' => 'Linked/Related Resources', 'av' => 'All versions', - 'ud' => 'Update Display' + 'ud' => 'Update Display', + 'pr' => 'Problems', + 'gr' => 'Graphics', + 'at' => 'All types', + 'hd' => 'Display Options', ); $r->print(< - +
+$lt{'hd'} +
+ - - - - + + + + + + - - - - + + + + + + - - - + + + + +
 
 
+END + my @file_categories = &Apache::loncommon::filecategories(); + my %select_file_categories; + my @select_form_order = (''); + $select_file_categories{''} = &mt('All file types'); + foreach my $cat (@file_categories) { + my $types = join(",",&Apache::loncommon::filecategorytypes($cat)); + $select_file_categories{$types} = $cat; + push(@select_form_order,$types); + } + $select_file_categories{'select_form_order'} = \@select_form_order; + my $type_element= + &Apache::loncommon::select_form($typeselect,'only', + %select_file_categories); + $type_element = ''; + $r->print($type_element + .'
'); + $r->print(< $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]; @@ -503,7 +537,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); } @@ -513,6 +547,11 @@ END # ------------------------------------------------------ Remember where we were &Apache::loncommon::storeresurl($storeuri); &Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri); +# -------------------------------------------------- Check All and Uncheck all + 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()); @@ -544,6 +583,16 @@ END if ($hash{'display_attrs_11'} == 1); $r->print("".&mt("Resource")."\n") if ($hash{'display_attrs_7'} == 1); + $r->print("".&mt("Subject")."\n") + if ($hash{'display_attrs_12'} == 1); + $r->print("".&mt("Notes")."\n") + if ($hash{'display_attrs_13'} == 1); + $r->print("".&mt("Abstract")."\n") + if ($hash{'display_attrs_14'} == 1); + $r->print("".&mt("Grade Level")."\n") + if ($hash{'display_attrs_15'} == 1); + $r->print("".&mt("Standards")."\n") + if ($hash{'display_attrs_16'} == 1); $r->print(''); # ----------------- read in what directories have previously been set to "open" @@ -638,7 +687,7 @@ sub scanDir { next if($strip =~ /.*\.meta$/ | $obs eq '1'); my (@fileparts) = split(/\./,$strip); if ($hash{'display_attrs_9'} != 1) { -# if not all versions to be shown + # if not all versions to be shown if (scalar(@fileparts) >= 3) { my $fext = pop @fileparts; my $ov = pop @fileparts; @@ -811,7 +860,7 @@ sub display_line { my $tabtag=''; my $i=0; - while ($i<=11) { + while ($i<=16) { $tabtag=join('',$tabtag," ") if ($i != 9 && $hash{'display_attrs_'.$i} == 1); @@ -830,15 +879,16 @@ sub display_line { $r->print("\n"); $r->print (''."\n"); - $r->print (''."\n"); $r->print (''."\n"); $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0" />'. + $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); $r->print(&mt("Up")."$tabtag\n"); return OK; @@ -858,17 +908,17 @@ sub display_line { $r->print(""); &begin_form ($r,$filecom[0]); my $anchor = $filecom[0]; - $anchor =~ s/\///g; + $anchor =~ s/\W//g; $r->print (''); $r->print (''); $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0" />'. + $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]); $r->print ('print (' border="0" />'."\n"); + $r->print (' class="LC_icon" />'."\n"); $r->print (&mt("Domain")." - $listname "); if (&Apache::lonnet::domain($listname,'description')) { $r->print("(".&Apache::lonnet::domain($listname,'description'). @@ -883,24 +933,20 @@ sub display_line { # $r->print("$extrafield"); my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; - $anchor =~ s/\///g; - $r->print(""); - $r->print("\n"); - $r->print("\n"); - $r->print("\n"); + $anchor =~ s/\W//g; + $r->print("$extrafield"); &begin_form ($r,$curdir); $r->print (''."\n"); + 'whitespace1.gif" class="LC_icon" />'."\n"); $r->print (''); $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0" />'. + $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); my $quotable_curdir = &Apache::loncommon::escape_single($curdir); $r->print (''); + .'\')">'.$msg.''); my $domain=(split(m|/|,$startdir))[2]; my $plainname=&Apache::loncommon::plainname($listname,$domain); $r->print ($listname); @@ -911,106 +957,112 @@ 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) { - foreach (@Omit) { return OK if ($curfext eq $_); } + foreach (@Omit) { return OK if (lc($curfext) eq $_); } } if (@Only) { my $skip = 1; - foreach (@Only) { $skip = 0 if ($curfext eq $_); } + foreach (@Only) { $skip = 0 if (lc($curfext) eq $_); } return OK if ($skip > 0); } # Set the icon for the file my $iconname = &Apache::loncommon::icon($listname); - $r->print(""); + $r->print(''. + ''); if ($env{'form.catalogmode'} eq 'interactive') { my $quotable_filelink = &Apache::loncommon::escape_single($filelink); $r->print(""); - $r->print("\"\"". + $r->print("\"\"". "\n"); - $r->print(""); + $r->print(''); } elsif ($env{'form.catalogmode'} eq 'import') { $r->print("
\n"); $r->print("print("checked"); } $r->print(" />\n"); - $r->print("
"); + $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 if ($filelink=~/\.(page|sequence)$/) { my $curdir = $startdir.$filecom[0].'/'; - my $anchor = $curdir; - $anchor =~ s/\///g; &begin_form($r,$curdir); $indent--; } # General indentation - if ($indent > 0 and $indent < 11) { - $r->print("\"\"\n"); + if ($indent > 0 and $indent < 16) { + $r->print("\"\"\n"); } elsif ($indent >0) { my $ten = int($indent/10.); my $rem = $indent%10.0; my $count = 0; while ($count < $ten) { - $r->print("\"\"\n"); + $r->print("\"\"\n"); $count++; } $r->print("\"\"\n") if $rem > 0; + ".gif class='LC_icon' />\n") if $rem > 0; } # Sequence open/close icon if ($filelink=~/\.(page|sequence)$/) { my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; - $anchor =~ s/\///g; + $anchor =~ s/\W//g; $r->print (''); $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0" />'. + $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); } # Filetype icons - $r->print("\"\"\n"); + $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) "); + "?inhibitmenu=yes','metadatafile','500','550','no','yes','no');\" ". + " target=\"_self\">".&mt('metadata').") "); # Close form to open/close sequence if ($filelink=~/\.(page|sequence)$/) { $r->print(''); } - $r->print("\n"); + $r->print("\n"); if ($hash{'display_attrs_0'} == 1) { - my $title = &Apache::lonnet::gettitle($filelink,'title'); $r->print(' '.($title eq '' ? ' ' : $title). ' '."\n"); } - $r->print(' ', + $r->print(' ', $filecom[8]," \n") if $hash{'display_attrs_1'} == 1; $r->print(' '. - (localtime($filecom[9]))." \n") + (&Apache::lonlocal::locallocaltime($filecom[9]))." \n") if $hash{'display_attrs_2'} == 1; $r->print(' '. - (localtime($filecom[10]))." \n") + (&Apache::lonlocal::locallocaltime($filecom[10]))." \n") if $hash{'display_attrs_3'} == 1; if ($hash{'display_attrs_4'} == 1) { @@ -1036,17 +1088,11 @@ sub display_line { # statistics &dynmetaread($filelink); $r->print(""); - &dynmetaprint($r,$filelink,'count'); - &dynmetaprint($r,$filelink,'course'); - &dynmetaprint($r,$filelink,'stdno'); - &dynmetaprint($r,$filelink,'avetries'); - &dynmetaprint($r,$filelink,'difficulty'); - &dynmetaprint($r,$filelink,'disc'); - &dynmetaprint($r,$filelink,'clear'); - &dynmetaprint($r,$filelink,'technical'); - &dynmetaprint($r,$filelink,'correct'); - &dynmetaprint($r,$filelink,'helpful'); - &dynmetaprint($r,$filelink,'depth'); + for (qw(count course stdno avetries difficulty disc clear technical + correct helpful depth)) { + + &dynmetaprint($r,$filelink,$_); + } $r->print(" \n"); } @@ -1055,10 +1101,11 @@ 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(''."Yes "."\n"); + " target=\"_self\">".&mt('Source Code')." "."\n"); } else { #A cuddled else. :P $r->print(" \n"); } @@ -1068,12 +1115,10 @@ sub display_line { &dynmetaread($filelink); $r->print(''); &coursecontext($r,$filelink); - &dynmetaprint($r,$filelink,'goto_list'); - &dynmetaprint($r,$filelink,'comefrom_list'); - &dynmetaprint($r,$filelink,'sequsage_list'); - &dynmetaprint($r,$filelink,'dependencies'); - &dynmetaprint($r,$filelink,'course_list'); - $r->print(''); + for (qw(goto_list comefrom_list sequsage_list dependencies course_list)) { + &dynmetaprint($r,$filelink,$_); + } + $r->print(''); } if ($hash{'display_attrs_7'} == 1) { # Show resource @@ -1081,6 +1126,36 @@ sub display_line { $r->print(' '.($output eq '' ? ' ':$output). " \n"); } + if ($hash{'display_attrs_12'} == 1) { + my $subject = &Apache::lonnet::metadata($filelink,'subject'); + $r->print(' '.($subject eq '' ? ' ' : $subject). + " \n"); + } + + if ($hash{'display_attrs_13'} == 1) { + my $notes = &Apache::lonnet::metadata($filelink,'notes'); + $r->print(' '.($notes eq '' ? ' ' : $notes). + " \n"); + } + + if ($hash{'display_attrs_14'} == 1) { + my $abstract = &Apache::lonnet::metadata($filelink,'abstract'); + $r->print(' '.($abstract eq '' ? ' ' : $abstract). + " \n"); + } + + if ($hash{'display_attrs_15'} == 1) { + my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel'); + $r->print(' '.($gradelevel eq '' ? ' ' : $gradelevel). + " \n"); + } + + if ($hash{'display_attrs_16'} == 1) { + my $standards = &Apache::lonnet::metadata($filelink,'standards'); + $r->print(' '.($standards eq '' ? ' ' : $standards). + " \n"); + } + $r->print("\n"); } @@ -1088,42 +1163,42 @@ sub display_line { if ($fnptr == $dirptr) { my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; - $anchor =~ s/\///g; + $anchor =~ s/\W//g; $r->print("$extrafield"); &begin_form ($r,$curdir); my $indentm1 = $indent-1; - if ($indentm1 < 11 and $indentm1 > 0) { + if ($indentm1 < 16 and $indentm1 > 0) { $r->print("\"\"\n"); + ".gif class='LC_icon' />\n"); } else { my $ten = int($indentm1/10.); my $rem = $indentm1%10.0; my $count = 0; while ($count < $ten) { $r->print ("\"\"\n"); + ,"whitespace10.gif class='LC_icon' />\n"); $count++; } $r->print ("\"\"\n") if $rem > 0; + ".gif class='LC_icon' />\n") if $rem > 0; } $r->print (''); $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0" />'. + $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); my $quotable_curdir = &Apache::loncommon::escape_single($curdir); $r->print ('' .''.&mt('Open Folder').''. + $iconpath.'folder_'.$diropen.'.gif" class="LC_icon" />'. "\n"); $r->print ("$listname\n"); # Attributes my $filelink = $startdir.$filecom[0].'/default'; if ($hash{'display_attrs_0'} == 1) { - my $title = &Apache::lonnet::gettitle($filelink,'title'); + my $title = &Apache::lonnet::gettitle($filelink); $r->print(' '.($title eq '' ? ' ' : $title). ' '."\n"); } @@ -1131,10 +1206,10 @@ sub display_line { $filecom[8]," \n") if $hash{'display_attrs_1'} == 1; $r->print(' '. - (localtime($filecom[9]))." \n") + (&Apache::lonlocal::locallocaltime($filecom[9]))." \n") if $hash{'display_attrs_2'} == 1; $r->print(' '. - (localtime($filecom[10]))." \n") + (&Apache::lonlocal::locallocaltime($filecom[10]))." \n") if $hash{'display_attrs_3'} == 1; if ($hash{'display_attrs_4'} == 1) { @@ -1160,12 +1235,42 @@ sub display_line { if ($hash{'display_attrs_10'} == 1) { $r->print(' '); } - if ($hash{'display_attrs_11'} == 1) { - $r->print(' '); - } if ($hash{'display_attrs_7'} == 1) { $r->print(' '); } + if ($hash{'display_attrs_12'} == 1) { + my $subject = &Apache::lonnet::metadata($filelink,'subject'); + $r->print(' '.($subject eq '' ? ' ' : $subject). + " \n"); + } + if ($hash{'display_attrs_11'} == 1) { + $r->print(' '); + } + if ($hash{'display_attrs_12'} == 1) { + my $subject = &Apache::lonnet::metadata($filelink,'subject'); + $r->print(' '.($subject eq '' ? ' ' : $subject). + " \n"); + } + if ($hash{'display_attrs_13'} == 1) { + my $notes = &Apache::lonnet::metadata($filelink,'notes'); + $r->print(' '.($notes eq '' ? ' ' : $notes). + " \n"); + } + if ($hash{'display_attrs_14'} == 1) { + my $abstract = &Apache::lonnet::metadata($filelink,'abstract'); + $r->print(' '.($abstract eq '' ? ' ' : $abstract). + " \n"); + } + if ($hash{'display_attrs_15'} == 1) { + my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel'); + $r->print(' '.($gradelevel eq '' ? ' ' : $gradelevel). + " \n"); + } + if ($hash{'display_attrs_16'} == 1) { + my $standards = &Apache::lonnet::metadata($filelink,'standards'); + $r->print(' '.($standards eq '' ? ' ' : $standards). + " \n"); + } $r->print(''); } @@ -1242,15 +1347,17 @@ sub dynmetaprint { sub begin_form { my ($r,$uri) = @_; my $anchor = $uri; - $anchor =~ s/\///g; + $anchor =~ s/\W//g; + $uri=&Apache::loncommon::escape_single($uri); $r->print ('
'."\n"); $r->print (''. "\n"); $r->print (''."\n"); + $r->print(&Apache::loncommon::inhibit_menu_check('input')); $dnum++; }