--- loncom/interface/lonindexer.pm 2010/04/14 16:11:34 1.181.4.6 +++ loncom/interface/lonindexer.pm 2009/02/11 15:40:33 1.188 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.181.4.6 2010/04/14 16:11:34 raeburn Exp $ +# $Id: lonindexer.pm,v 1.188 2009/02/11 15:40:33 jms Exp $ # # Copyright Michigan State University Board of Trustees # @@ -104,7 +104,7 @@ sub handler { my $lonhost = $r->dir_config('lonHostID'); my $tabdir = $r->dir_config('lonTabDir'); - my $fileclr='#ffffe6'; +#SB my $fileclr='#ffffe6'; my $line; my (@attrchk,@openpath,$typeselect); my $uri=$r->uri; @@ -177,28 +177,30 @@ ENDSUBM # --------------------- define extra fields and buttons in case of special mode if ($env{'form.catalogmode'} eq 'interactive') { - $extrafield=''. +#SB $extrafield=''. + $extrafield=''. ''; $colspan=" colspan='2' "; my $cl=&mt('Close'); $closebutton=< + END } elsif ($env{'form.catalogmode'} eq 'import') { - $extrafield=''. +#SB $extrafield=''. + $extrafield=''. ''; $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 @@ -319,8 +321,10 @@ function select_group() { function changeURL(val) { if (window.opener.document) { - var elementname = "$element"; + var elementname = "$element"+"_value"; + var checkboxname = "$element"+"_setparmval"; window.opener.document.forms["$form"].elements[elementname].value=val; + window.opener.document.forms["$form"].elements[checkboxname].checked=true; } else { alert("The file you selected is: "+val); } @@ -405,14 +409,8 @@ function gothere(val) { ENDHEADER my ($headerdom)=($uri=~m{^/res/($match_domain)/}); - my %args = ( - 'domain' => $headerdom, - ); - if ($env{'form.catalogmode'}) { - # "Popup mode" - $args{'only_body'} = 1; - } - $r->print(&Apache::loncommon::start_page('Browse Resources',$js,\%args)); + $r->print(&Apache::loncommon::start_page('Browse Resources',$js, + {'domain' => $headerdom,})); # ---------------------------------- get state of file types to be showing if ($env{'form.only'}) { $typeselect = $env{'form.only'}; @@ -422,104 +420,94 @@ ENDHEADER # ---------------------------------- get state of file attributes to be showing if ($env{'form.attrs'}) { - for (my $i=0; $i<=16; $i++) { + for (my $i=0; $i<=14; $i++) { delete $hash{'display_attrs_'.$i}; if ($env{'form.attr'.$i} == 1) { - $attrchk[$i] = 'checked="checked"'; + $attrchk[$i] = 'checked'; $hash{'display_attrs_'.$i} = 1; } } } else { - for (my $i=0; $i<=16; $i++) { - $attrchk[$i] = 'checked="checked"' if $hash{'display_attrs_'.$i} == 1; + for (my $i=0; $i<=14; $i++) { + $attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1; } } - 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} = &mt($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); - my $type_selector = ''; - # ------------------------------- output state of file attributes to be showing # All versions has to the last item # since it does not take an extra col - - my %lt=&Apache::lonlocal::texthash( - 'av' => 'All versions', - 'ud' => 'Update Display', - 'pr' => 'Problems', - 'gr' => 'Graphics', - 'at' => 'All types', - 'hd' => 'Display Options' - ); - my @disp_order = ('0','4','5','6','13','1','2','3','10','14','8','11','7','12','15','16'); - my %disp_options = &Apache::lonlocal::texthash ( - 0 => 'Title', - 4 => 'Author', - 5 => 'Keywords', - 6 => 'Language', - 13 => 'Notes', - 1 => 'Size', - 2 => 'Last access', - 3 => 'Last modified', - 10 => 'Source Available', - 14 => 'Abstract', - 8 => 'Statistics', - 11 => 'Linked/Related Resources', - 7 => 'Show resource', - 12 => 'Subject', - 15 => 'Grade Level', - 16 => 'Standards', - ); - my $cell = 0; - my $numinrow = 4; - $r->print(' -
+ my %lt=&Apache::lonlocal::texthash( + 'ti' => 'Title', + 'si' => 'Size', + 'la' => 'Last access', + 'lm' => 'Last modified', + 'st' => 'Statistics', + 'au' => 'Author', + 'kw' => 'Keywords', + 'sb' => 'Subject', + 'nt' => 'Notes', + 'ab' => 'Abstract', + 'ln' => 'Language', + 'sa' => 'Source Available', + 'sr' => 'Show resource', + 'li' => 'Linked/Related Resources', + 'av' => 'All versions', + 'ud' => 'Update Display', + 'pr' => 'Problems', + 'gr' => 'Graphics', + 'at' => 'All types', + 'hd' => 'Display Options' + ); + $r->print(< -'.$lt{'hd'}.' -'."\n"); - foreach my $item (@disp_order) { - my $style = 'padding-left: 12px; padding-right: 8px;'; - if ($cell%$numinrow == 0) { - $r->print(''); - } - $cell ++; - if ($cell > 3 * $numinrow) { - $style .= ' padding-bottom: 6px;'; - } - if (defined($disp_options{$item})) { - $r->print(''."\n"); - } - if ($cell > 1 && $cell%$numinrow == 0) { - $r->print(''); - } - } - $r->print(<$lt{'hd'} + + +
'. - '
- - + + + + + + + + + + + + + + + + + + +
- -$type_selector
 
- +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 @@ -553,51 +541,50 @@ END &Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri); # -------------------------------------------------- Check All and Uncheck all if ($env{'form.catalogmode'} eq 'import') { - $r->print('
'); - $r->print(''); + $r->print('
'); + $r->print(''); } # ----------------- output starting row to the indexed file/directory hierarchy - my $titleclr="#ddffff"; #$r->print(&initdebug()); #$r->print(&writedebug("Omit:@Omit")) if (@Omit); #$r->print(&writedebug("Only:@Only")) if (@Only); - $r->print('
'."\n"); - $r->print(''."\n"); - $r->print("\n"); - $r->print("\n") + $r->print('

'); + $r->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row()); + $r->print("\n"); + $r->print("\n") if ($hash{'display_attrs_0'} == 1); - $r->print("\n") if ($hash{'display_attrs_1'} == 1); - $r->print("\n") + $r->print('\n") if ($hash{'display_attrs_1'} == 1); + $r->print("\n") if ($hash{'display_attrs_2'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_3'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_4'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_5'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_6'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_8'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_10'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_11'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_7'} == 1); - $r->print("\n") - if ($hash{'display_attrs_12'} == 1); - $r->print("\n") - if ($hash{'display_attrs_13'} == 1); - $r->print("\n") - if ($hash{'display_attrs_14'} == 1); - $r->print("\n") - if ($hash{'display_attrs_15'} == 1); - $r->print("\n") - if ($hash{'display_attrs_16'} == 1); - $r->print(''); + $r->print("\n") + if ($hash{'display_attrs_12'} == 1); + $r->print("\n") + if ($hash{'display_attrs_13'} == 1); + $r->print("\n") + if ($hash{'display_attrs_14'} == 1); + + $r->print(&Apache::loncommon::end_data_table_header_row()); + + # ----------------- read in what directories have previously been set to "open" foreach (keys %hash) { @@ -647,15 +634,13 @@ END # -------- recursively go through all the directories and output as appropriate &scanDir ($r,$toplevel,$indent,\%hash); - # -------------------------------------------------------------- end the tables - $r->print('
".&mt('Name')."".&mt('Title')."".&mt('Name')."".&mt('Title')."".&mt("Size")." (".&mt("bytes").") ". - "".&mt("Last accessed")."'.&mt("Size")." (".&mt("bytes").") ". + "".&mt("Last accessed")."".&mt("Last modified")."".&mt("Last modified")."".&mt("Author(s)")."".&mt("Author(s)")."".&mt("Keywords")."".&mt("Keywords")."".&mt("Language")."".&mt("Language")."".&mt("Usage Statistics")."
(". - &mt("Courses/Network Hits").") ".&mt('updated periodically')."		".&mt("Usage Statistics")."
(". + &mt("Courses/Network Hits").") ".&mt('updated periodically')."		".&mt("Source Available")."".&mt("Source Available")."".&mt("Linked/Related Resources")."".&mt("Linked/Related Resources")."".&mt("Resource")."".&mt("Resource")."".&mt("Subject")."".&mt("Notes")."".&mt("Abstract")."".&mt("Grade Level")."".&mt("Standards")."
".&mt("Subject")."".&mt("Notes")."".&mt("Abstract")."
'); + $r->print(&Apache::loncommon::end_data_table()); + # ---------------------------- embed hidden information useful for group import $r->print(""); $r->print(""); -# -------------------------------------------------------------- end the tables - $r->print('
'); # --------------------------------------------------- end the output and return $r->print(&Apache::loncommon::end_page()."\n"); @@ -852,7 +837,7 @@ sub display_line { $pathprefix=$startdir; } my $dirptr=16384; - my $fileclr="#ffffe6"; +#SB my $fileclr="#ffffe6"; my $iconpath= $r->dir_config('lonIconsURL') . '/'; my @filecom = split (/\&/,$line); @@ -864,7 +849,7 @@ sub display_line { my $tabtag=''; my $i=0; - while ($i<=16) { + while ($i<=14) { $tabtag=join('',$tabtag," ") if ($i != 9 && $hash{'display_attrs_'.$i} == 1); @@ -879,36 +864,41 @@ sub display_line { $updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1]; $updir=~s/\/+/\//g; - $r->print("$extrafield"); +#SB $r->print("$extrafield"); + $r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!? + $r->print($extrafield); $r->print("\n"); $r->print ('
'."\n"); $r->print(&Apache::loncommon::inhibit_menu_check('input')); - $r->print (''."\n"); $r->print (''."\n"); $r->print ('print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); - $r->print(&mt("Up")."
$tabtag\n"); + $r->print(&mt("Up")."$tabtag"); + $r->print(&Apache::loncommon::end_data_table_row()); return OK; } # Do we have permission to look at this? - if($filecom[15] ne '1') { return OK if ((!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])) && (!&Apache::lonnet::allowed('bro',$pathprefix.$filecom[0]))); } + if($filecom[15] ne '1') { return OK if (!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])); } # make absolute links appear on different background - if ($absolute) { $fileclr='#ccdd99'; } +#SB if ($absolute) { $fileclr='#ccdd99'; } # display domain if ($filecom[1] eq 'domain') { $r->print (''."\n") if ($env{'form.dirPointer'} eq "on"); - $r->print("$extrafield"); +#SB $r->print("$extrafield"); + $r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?" + $r->print($extrafield); $r->print(""); &begin_form ($r,$filecom[0]); my $anchor = $filecom[0]; @@ -917,7 +907,7 @@ sub display_line { $r->print (''); $r->print ('print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]); $r->print ('print ("$tabtag\n"); + $r->print("$tabtag"); + $r->print(&Apache::loncommon::end_data_table_row()); return OK; # display user directory @@ -938,14 +929,16 @@ sub display_line { my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; $anchor =~ s/\W//g; - $r->print("$extrafield"); +#SB $r->print("$extrafield"); + $r->print(&Apache::loncommon::start_data_table_row() + .$extrafield.''); &begin_form ($r,$curdir); $r->print (''."\n"); $r->print (''); $r->print ('print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); my $quotable_curdir = &Apache::loncommon::escape_single($curdir); $r->print ('print (''.$tabtag.''."\n"); + $r->print(''.$tabtag); + $r->print(&Apache::loncommon::end_data_table_row()); return OK; } @@ -978,8 +972,9 @@ sub display_line { } # Set the icon for the file my $iconname = &Apache::loncommon::icon($listname); - $r->print(''. - ''); +#SB $r->print("); + $r->print(&Apache::loncommon::start_data_table_row()); #SB valign="$valign" ?!? + $r->print(''); if ($env{'form.catalogmode'} eq 'interactive') { my $quotable_filelink = &Apache::loncommon::escape_single($filelink); @@ -991,7 +986,7 @@ sub display_line { } elsif ($env{'form.catalogmode'} eq 'import') { $r->print("
\n"); $r->print("print("checked"); @@ -1012,7 +1007,7 @@ sub display_line { $indent--; } # General indentation - if ($indent > 0 and $indent < 16) { + if ($indent > 0 and $indent < 14) { $r->print("\"\"\n"); } elsif ($indent >0) { @@ -1035,7 +1030,7 @@ sub display_line { $r->print (''); $r->print ('print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); } # Filetype icons @@ -1080,7 +1075,6 @@ sub display_line { $r->print(' '.($keywords eq '' ? ' ' : $keywords). " \n"); } -#' if ($hash{'display_attrs_6'} == 1) { my $lang = &Apache::lonnet::metadata($filelink,'language'); @@ -1092,11 +1086,17 @@ sub display_line { # statistics &dynmetaread($filelink); $r->print(""); - for (qw(count course stdno avetries difficulty disc clear technical - correct helpful depth)) { - - &dynmetaprint($r,$filelink,$_); - } + &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'); $r->print(" \n"); } @@ -1119,59 +1119,58 @@ sub display_line { &dynmetaread($filelink); $r->print(''); &coursecontext($r,$filelink); - for (qw(goto_list comefrom_list sequsage_list dependencies course_list)) { - &dynmetaprint($r,$filelink,$_); - } - $r->print(''); + &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(''); } - if ($hash{'display_attrs_7'} == 1) { + + + + if ($hash{'display_attrs_7'} == 1) { # Show resource my $output=&showpreview($filelink); $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"); } + + 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"); + } + + $r->print(&Apache::loncommon::end_data_table_row()); +} + + # -- display directory if ($fnptr == $dirptr) { my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; $anchor =~ s/\W//g; - $r->print("$extrafield"); +#SB $r->print("$extrafield"); + $r->print(&Apache::loncommon::start_data_table_row()); # SB: bgcolor suggestion: darkgrey ("LC_info_row"?!?) +# $r->print(''); + $r->print($extrafield.''); &begin_form ($r,$curdir); my $indentm1 = $indent-1; - if ($indentm1 < 16 and $indentm1 > 0) { + if ($indentm1 < 12 and $indentm1 > 0) { $r->print("\"\"\n"); } else { @@ -1189,7 +1188,7 @@ sub display_line { $r->print (''); $r->print ('print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); my $quotable_curdir = &Apache::loncommon::escape_single($curdir); $r->print ('print(' ', + $r->print(' ', $filecom[8]," \n") if $hash{'display_attrs_1'} == 1; $r->print(' '. @@ -1233,6 +1232,7 @@ sub display_line { $r->print(' '.($lang eq '' ? ' ' : $lang). " \n"); } + if ($hash{'display_attrs_8'} == 1) { $r->print(' '); } @@ -1241,41 +1241,28 @@ sub display_line { } 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(''); + } + 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"); + } + + $r->print(&Apache::loncommon::end_data_table_row()); } } @@ -1355,7 +1342,7 @@ sub begin_form { $uri=&Apache::loncommon::escape_single($uri); $r->print (''."\n"); $r->print (''.