--- loncom/interface/lonindexer.pm 2007/08/17 18:14:37 1.176 +++ loncom/interface/lonindexer.pm 2009/12/02 18:22:20 1.181.6.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.176 2007/08/17 18:14:37 banghart Exp $ +# $Id: lonindexer.pm,v 1.181.6.2 2009/12/02 18:22:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -183,7 +183,7 @@ ENDSUBM $colspan=" colspan='2' "; my $cl=&mt('Close'); $closebutton=< + END } elsif ($env{'form.catalogmode'} eq 'import') { @@ -194,11 +194,11 @@ END 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 @@ -407,8 +407,14 @@ function gothere(val) { ENDHEADER my ($headerdom)=($uri=~m{^/res/($match_domain)/}); - $r->print(&Apache::loncommon::start_page('Browse Resources',$js, - {'domain' => $headerdom,})); + 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'}; @@ -418,16 +424,16 @@ ENDHEADER # ---------------------------------- 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; } } @@ -442,7 +448,12 @@ 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', @@ -450,44 +461,67 @@ ENDHEADER 'ud' => 'Update Display', 'pr' => 'Problems', 'gr' => 'Graphics', - 'at' => 'All types' + 'at' => 'All types', + 'hd' => 'Display Options', ); $r->print(< - +
+$lt{'hd'} +
+ - - - - + + + + + + - - - - + + + + + + - - - + + + + +
 
 
-
'); + $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]; @@ -515,8 +549,8 @@ 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"; @@ -549,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" @@ -643,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; @@ -816,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); @@ -835,16 +879,16 @@ sub display_line { $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.'" type="image" class="LC_indexer_icon" />'. + $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); $r->print(&mt("Up")."$tabtag\n"); return OK; @@ -869,7 +913,7 @@ sub display_line { $r->print (''); $r->print ('print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]); $r->print (''); $r->print ('print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); my $quotable_curdir = &Apache::loncommon::escape_single($curdir); $r->print ('"); + $r->print(''. + ''); if ($env{'form.catalogmode'} eq 'interactive') { my $quotable_filelink = &Apache::loncommon::escape_single($filelink); @@ -938,17 +983,17 @@ sub display_line { $quotable_filelink,"')\">"); $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"}) { @@ -963,7 +1008,7 @@ sub display_line { $indent--; } # General indentation - if ($indent > 0 and $indent < 11) { + if ($indent > 0 and $indent < 16) { $r->print("\"\"\n"); } elsif ($indent >0) { @@ -986,7 +1031,7 @@ sub display_line { $r->print (''); $r->print ('print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); } # Filetype icons @@ -1000,24 +1045,24 @@ sub display_line { &Apache::loncommon::inhibit_menu_check(\$quotable_filelink); $r->print (" (metadata) "); + " 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) { $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) { @@ -1043,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"); } @@ -1066,7 +1105,7 @@ sub display_line { $r->print(''."Yes "."\n"); + " target=\"_self\">".&mt('Source Code')." "."\n"); } else { #A cuddled else. :P $r->print(" \n"); } @@ -1076,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 @@ -1089,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"); } @@ -1100,7 +1167,7 @@ sub display_line { $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"); } else { @@ -1118,7 +1185,7 @@ sub display_line { $r->print (''); $r->print ('print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'. + $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'. "\n"); my $quotable_curdir = &Apache::loncommon::escape_single($curdir); $r->print ('\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) { @@ -1168,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(''); } @@ -1199,8 +1296,12 @@ sub showpreview { my $output=''; my $embstyle=&Apache::loncommon::fileembstyle($curfext); if ($embstyle eq 'ssi') { - my $cache=$Apache::lonnet::perlvar{'lonDocRoot'}.$filelink. - '.tmp'; + my $cache = $Apache::lonnet::perlvar{'lonDocRoot'}.$filelink; + if ($env{'request.gcicontext'} eq 'buildtest') { + $cache .= '.tn'; + } else { + $cache .= '.tmp'; + } if ((!$env{'form.updatedisplay'}) && (-e $cache)) { open(FH,$cache); @@ -1254,7 +1355,7 @@ sub begin_form { $uri=&Apache::loncommon::escape_single($uri); $r->print ('
'."\n"); $r->print (''. 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.