[BACK]Return to lonindexer.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonindexer.pm between versions 1.178 and 1.182

version 1.178, 2007/08/17 22:27:00 version 1.182, 2008/09/19 08:50:42
Line 104  sub handler { Line 104  sub handler {
     my $lonhost = $r->dir_config('lonHostID');      my $lonhost = $r->dir_config('lonHostID');
     my $tabdir  = $r->dir_config('lonTabDir');      my $tabdir  = $r->dir_config('lonTabDir');
   
     my $fileclr='#ffffe6';  #SB my $fileclr='#ffffe6';
     my $line;      my $line;
     my (@attrchk,@openpath,$typeselect);      my (@attrchk,@openpath,$typeselect);
     my $uri=$r->uri;      my $uri=$r->uri;
Line 177  ENDSUBM Line 177  ENDSUBM
   
 # --------------------- define extra fields and buttons in case of special mode  # --------------------- define extra fields and buttons in case of special mode
  if ($env{'form.catalogmode'} eq 'interactive') {   if ($env{'form.catalogmode'} eq 'interactive') {
     $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.  #SB    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
               $extrafield='<td valign="bottom">'.
  '<img alt="" src="'.$iconpath.'whitespace1.gif"'.   '<img alt="" src="'.$iconpath.'whitespace1.gif"'.
  ' class="LC_icon" /></td>';   ' class="LC_icon" /></td>';
     $colspan=" colspan='2' ";      $colspan=" colspan='2' ";
Line 187  ENDSUBM Line 188  ENDSUBM
 END  END
         }          }
  elsif ($env{'form.catalogmode'} eq 'import') {   elsif ($env{'form.catalogmode'} eq 'import') {
     $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.  #SB    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
               $extrafield='<td valign="bottom">'.
  '<img alt="" src="'.$iconpath.'whitespace1.gif"'.   '<img alt="" src="'.$iconpath.'whitespace1.gif"'.
  ' class="LC_icon" /></td>';   ' class="LC_icon" /></td>';
     $colspan=" colspan='2' ";      $colspan=" colspan='2' ";
Line 481  END Line 483  END
         my @file_categories = &Apache::loncommon::filecategories();          my @file_categories = &Apache::loncommon::filecategories();
         my %select_file_categories;          my %select_file_categories;
         my @select_form_order = ('');          my @select_form_order = ('');
         $select_file_categories{''} = 'All file types';          $select_file_categories{''} = &mt('All file types');
         foreach my $cat (@file_categories) {          foreach my $cat (@file_categories) {
     my $types = join(",",&Apache::loncommon::filecategorytypes($cat));      my $types = join(",",&Apache::loncommon::filecategorytypes($cat));
     $select_file_categories{$types} = $cat;      $select_file_categories{$types} = $cat;
Line 533  END Line 535  END
     $r->print('<input type="button" value="'.&mt("Uncheck All").'" id="uncheckallbutton" onClick="javascript:uncheckAll()" />');      $r->print('<input type="button" value="'.&mt("Uncheck All").'" id="uncheckallbutton" onClick="javascript:uncheckAll()" />');
  }   }
 # ----------------- output starting row to the indexed file/directory hierarchy  # ----------------- output starting row to the indexed file/directory hierarchy
         my $titleclr="#ddffff";  
         #$r->print(&initdebug());          #$r->print(&initdebug());
         #$r->print(&writedebug("Omit:@Omit")) if (@Omit);          #$r->print(&writedebug("Omit:@Omit")) if (@Omit);
         #$r->print(&writedebug("Only:@Only")) if (@Only);          #$r->print(&writedebug("Only:@Only")) if (@Only);
         $r->print('<table width="100%" border="0"><tr><td bgcolor="#777777">'."\n");          $r->print('<br /><br />');
  $r->print('<table width="100%" border="0"><tr bgcolor="'.$titleclr.'">'."\n");          $r->print(&Apache::loncommon::start_data_table()
  $r->print("<td $colspan><b>".&mt('Name')."</b></td>\n");                   .&Apache::loncommon::start_data_table_header_row());
  $r->print("<td><b>".&mt('Title')."</b></td>\n")    $r->print("<th $colspan>".&mt('Name')."</th>\n");
    $r->print("<th>".&mt('Title')."</th>\n") 
     if ($hash{'display_attrs_0'} == 1);      if ($hash{'display_attrs_0'} == 1);
  $r->print("<td align=right><b>".&mt("Size")." (".&mt("bytes").") ".   $r->print('<th align="right">'.&mt("Size")." (".&mt("bytes").") ".
   "</b></td>\n") if ($hash{'display_attrs_1'} == 1);    "</th>\n") if ($hash{'display_attrs_1'} == 1);
  $r->print("<td><b>".&mt("Last accessed")."</b></td>\n")    $r->print("<th>".&mt("Last accessed")."</th>\n") 
     if ($hash{'display_attrs_2'} == 1);      if ($hash{'display_attrs_2'} == 1);
  $r->print("<td><b>".&mt("Last modified")."</b></td>\n")   $r->print("<th>".&mt("Last modified")."</th>\n")
     if ($hash{'display_attrs_3'} == 1);      if ($hash{'display_attrs_3'} == 1);
  $r->print("<td><b>".&mt("Author(s)")."</b></td>\n")   $r->print("<th>".&mt("Author(s)")."</th>\n")
     if ($hash{'display_attrs_4'} == 1);      if ($hash{'display_attrs_4'} == 1);
  $r->print("<td><b>".&mt("Keywords")."</b></td>\n")   $r->print("<th>".&mt("Keywords")."</th>\n")
     if ($hash{'display_attrs_5'} == 1);      if ($hash{'display_attrs_5'} == 1);
  $r->print("<td><b>".&mt("Language")."</b></td>\n")   $r->print("<th>".&mt("Language")."</th>\n")
     if ($hash{'display_attrs_6'} == 1);      if ($hash{'display_attrs_6'} == 1);
  $r->print("<td><b>".&mt("Usage Statistics")." <br />(".   $r->print("<th>".&mt("Usage Statistics")." <br />(".
   &mt("Courses/Network Hits").")</b> ".&mt('updated periodically')."</td>\n")    &mt("Courses/Network Hits").") ".&mt('updated periodically')."</th>\n")
     if ($hash{'display_attrs_8'} == 1);      if ($hash{'display_attrs_8'} == 1);
  $r->print("<td><b>".&mt("Source Available")."</b></td>\n")   $r->print("<th>".&mt("Source Available")."</th>\n")
     if ($hash{'display_attrs_10'} == 1);      if ($hash{'display_attrs_10'} == 1);
  $r->print("<td><b>".&mt("Linked/Related Resources")."</b></td>\n")   $r->print("<th>".&mt("Linked/Related Resources")."</th>\n")
     if ($hash{'display_attrs_11'} == 1);      if ($hash{'display_attrs_11'} == 1);
  $r->print("<td><b>".&mt("Resource")."</b></td>\n")   $r->print("<th>".&mt("Resource")."</th>\n")
     if ($hash{'display_attrs_7'} == 1);      if ($hash{'display_attrs_7'} == 1);
  $r->print('</tr>');          $r->print(&Apache::loncommon::end_data_table_header_row());
   
 # ----------------- read in what directories have previously been set to "open"  # ----------------- read in what directories have previously been set to "open"
  foreach (keys %hash) {   foreach (keys %hash) {
Line 613  END Line 615  END
   
 # -------- recursively go through all the directories and output as appropriate  # -------- recursively go through all the directories and output as appropriate
  &scanDir ($r,$toplevel,$indent,\%hash);   &scanDir ($r,$toplevel,$indent,\%hash);
   
   
 # -------------------------------------------------------------- end the tables  # -------------------------------------------------------------- end the tables
  $r->print('</table>');          $r->print(&Apache::loncommon::end_data_table());
   
 # ---------------------------- embed hidden information useful for group import  # ---------------------------- embed hidden information useful for group import
  $r->print("<form name='fnum' action=''>");   $r->print("<form name='fnum' action=''>");
  $r->print("<input type='hidden' name='fnum' value='$fnum' /></form>");   $r->print("<input type='hidden' name='fnum' value='$fnum' /></form>");
 # -------------------------------------------------------------- end the tables  
  $r->print('</td></tr></table>');  
   
 # --------------------------------------------------- end the output and return  # --------------------------------------------------- end the output and return
  $r->print(&Apache::loncommon::end_page()."\n");   $r->print(&Apache::loncommon::end_page()."\n");
Line 657  sub scanDir { Line 657  sub scanDir {
  next if($strip =~ /.*\.meta$/ | $obs eq '1');   next if($strip =~ /.*\.meta$/ | $obs eq '1');
  my (@fileparts) = split(/\./,$strip);   my (@fileparts) = split(/\./,$strip);
  if ($hash{'display_attrs_9'} != 1) {   if ($hash{'display_attrs_9'} != 1) {
 # if not all versions to be shown              # if not all versions to be shown
     if (scalar(@fileparts) >= 3) {      if (scalar(@fileparts) >= 3) {
  my $fext = pop @fileparts;   my $fext = pop @fileparts;
  my $ov = pop @fileparts;   my $ov = pop @fileparts;
Line 818  sub display_line { Line 818  sub display_line {
  $pathprefix=$startdir;   $pathprefix=$startdir;
     }      }
     my $dirptr=16384;      my $dirptr=16384;
     my $fileclr="#ffffe6";  #SB my $fileclr="#ffffe6";
     my $iconpath= $r->dir_config('lonIconsURL') . '/';      my $iconpath= $r->dir_config('lonIconsURL') . '/';
   
     my @filecom = split (/\&/,$line);      my @filecom = split (/\&/,$line);
Line 845  sub display_line { Line 845  sub display_line {
  $updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1];   $updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1];
  $updir=~s/\/+/\//g;   $updir=~s/\/+/\//g;
   
  $r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");  #SB $r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
           $r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?
           $r->print($extrafield);
  $r->print("<td>\n");   $r->print("<td>\n");
  $r->print ('<form method="post" name="dirpathUP" action="'.$updir.   $r->print ('<form method="post" name="dirpathUP" action="'.$updir.
    '/" '.     '/" '.
Line 860  sub display_line { Line 862  sub display_line {
  $r->print ('<input src="'.$iconpath.'arrow_up.gif"');   $r->print ('<input src="'.$iconpath.'arrow_up.gif"');
  $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.   $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
    "\n");     "\n");
  $r->print(&mt("Up")."</form>$tabtag</tr>\n");   $r->print(&mt("Up")."</form>$tabtag");
           $r->print(&Apache::loncommon::end_data_table_row());
  return OK;   return OK;
     }      }
 # Do we have permission to look at this?  # Do we have permission to look at this?
Line 868  sub display_line { Line 871  sub display_line {
     if($filecom[15] ne '1') { return OK if (!&Apache::lonnet::allowed('bre',$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  # make absolute links appear on different background
     if ($absolute) { $fileclr='#ccdd99'; }  #SB    if ($absolute) { $fileclr='#ccdd99'; }
   
 # display domain  # display domain
     if ($filecom[1] eq 'domain') {      if ($filecom[1] eq 'domain') {
   $r->print ('<input type="hidden" name="dirPointer" value="on" />'."\n")    $r->print ('<input type="hidden" name="dirPointer" value="on" />'."\n")
      if ($env{'form.dirPointer'} eq "on");       if ($env{'form.dirPointer'} eq "on");
  $r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");  #SB $r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
    $r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?"
           $r->print($extrafield);
  $r->print("<td>");   $r->print("<td>");
  &begin_form ($r,$filecom[0]);   &begin_form ($r,$filecom[0]);
  my $anchor = $filecom[0];   my $anchor = $filecom[0];
Line 894  sub display_line { Line 899  sub display_line {
     $r->print("(".&Apache::lonnet::domain($listname,'description').      $r->print("(".&Apache::lonnet::domain($listname,'description').
       ")");        ")");
  }   }
  $r->print ("</form>$tabtag</tr>\n");   $r->print("</form>$tabtag");
            $r->print(&Apache::loncommon::end_data_table_row());
  return OK;   return OK;
   
 # display user directory  # display user directory
Line 904  sub display_line { Line 910  sub display_line {
  my $curdir = $startdir.$filecom[0].'/';   my $curdir = $startdir.$filecom[0].'/';
  my $anchor = $curdir;   my $anchor = $curdir;
  $anchor =~ s/\W//g;   $anchor =~ s/\W//g;
  $r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");  #SB $r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
           $r->print(&Apache::loncommon::start_data_table_row()
                    .$extrafield.'<td valign="'.$valign.'">');
  &begin_form ($r,$curdir);   &begin_form ($r,$curdir);
  $r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.   $r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.
    'whitespace1.gif" class="LC_icon" />'."\n");     'whitespace1.gif" class="LC_icon" />'."\n");
Line 921  sub display_line { Line 929  sub display_line {
  my $plainname=&Apache::loncommon::plainname($listname,$domain);   my $plainname=&Apache::loncommon::plainname($listname,$domain);
  $r->print ($listname);   $r->print ($listname);
  if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }   if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
  $r->print ('</form>'.$tabtag.'</tr>'."\n");   $r->print('</form>'.$tabtag);
           $r->print(&Apache::loncommon::end_data_table_row());
  return OK;   return OK;
     }      }
   
Line 935  sub display_line { Line 944  sub display_line {
  my @file_ext = split (/\./,$listname);   my @file_ext = split (/\./,$listname);
  my $curfext = $file_ext[-1];   my $curfext = $file_ext[-1];
         if (@Omit) {          if (@Omit) {
             foreach (@Omit) { return OK if ($curfext eq $_); }              foreach (@Omit) { return OK if (lc($curfext) eq $_); }
         }          }
         if (@Only) {          if (@Only) {
             my $skip = 1;              my $skip = 1;
             foreach (@Only) { $skip = 0 if ($curfext eq $_); }              foreach (@Only) { $skip = 0 if (lc($curfext) eq $_); }
             return OK if ($skip > 0);              return OK if ($skip > 0);
         }          }
  # Set the icon for the file   # Set the icon for the file
  my $iconname = &Apache::loncommon::icon($listname);   my $iconname = &Apache::loncommon::icon($listname);
  $r->print("<tr valign='$valign' bgcolor=\"$fileclr\"><td nowrap='nowrap' valign='top'>");  #SB $r->print("<tr valign='$valign' bgcolor=\"$fileclr\"><td nowrap='nowrap' valign='top'>");
    $r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?"
           $r->print('<td nowrap="nowrap" valign="top">');
   
         if ($env{'form.catalogmode'} eq 'interactive') {          if ($env{'form.catalogmode'} eq 'interactive') {
     my $quotable_filelink = &Apache::loncommon::escape_single($filelink);      my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
Line 1014  sub display_line { Line 1025  sub display_line {
  &Apache::loncommon::inhibit_menu_check(\$quotable_filelink);   &Apache::loncommon::inhibit_menu_check(\$quotable_filelink);
  $r->print (" (<a href=\"javascript:openWindow('".$quotable_filelink.   $r->print (" (<a href=\"javascript:openWindow('".$quotable_filelink.
    "?inhibitmenu=yes','metadatafile','500','550','no','yes','no');\" ".     "?inhibitmenu=yes','metadatafile','500','550','no','yes','no');\" ".
    " target=\"_self\">metadata</a>) ");     " target=\"_self\">".&mt('metadata')."</a>) ");
 # Close form to open/close sequence  # Close form to open/close sequence
  if ($filelink=~/\.(page|sequence)$/) {   if ($filelink=~/\.(page|sequence)$/) {
     $r->print('</form>');      $r->print('</form>');
Line 1028  sub display_line { Line 1039  sub display_line {
   $filecom[8]," </td>\n")     $filecom[8]," </td>\n") 
     if $hash{'display_attrs_1'} == 1;      if $hash{'display_attrs_1'} == 1;
  $r->print('<td> '.   $r->print('<td> '.
   (localtime($filecom[9]))." </td>\n")                     (&Apache::lonlocal::locallocaltime($filecom[9]))." </td>\n")
     if $hash{'display_attrs_2'} == 1;      if $hash{'display_attrs_2'} == 1;
  $r->print('<td> '.   $r->print('<td> '.
   (localtime($filecom[10]))." </td>\n")                     (&Apache::lonlocal::locallocaltime($filecom[10]))." </td>\n")
     if $hash{'display_attrs_3'} == 1;      if $hash{'display_attrs_3'} == 1;
   
  if ($hash{'display_attrs_4'} == 1) {   if ($hash{'display_attrs_4'} == 1) {
Line 1080  sub display_line { Line 1091  sub display_line {
  $r->print('<td>'."<a href=\"javascript:openWindow('"   $r->print('<td>'."<a href=\"javascript:openWindow('"
   .$quotable_sourcelink.    .$quotable_sourcelink.
   "', 'previewsource', '700', '700', 'no', 'yes','yes');\"".    "', 'previewsource', '700', '700', 'no', 'yes','yes');\"".
   " target=\"_self\">Yes</a> "."</td>\n");    " target=\"_self\">".&mt('Source Code')."</a> "."</td>\n");
     } else { #A cuddled else. :P      } else { #A cuddled else. :P
  $r->print("<td>&nbsp;</td>\n");   $r->print("<td>&nbsp;</td>\n");
     }      }
Line 1103  sub display_line { Line 1114  sub display_line {
            $r->print('<td> '.($output eq '' ? '&nbsp;':$output).             $r->print('<td> '.($output eq '' ? '&nbsp;':$output).
       " </td>\n");        " </td>\n");
         }          }
  $r->print("</tr>\n");          $r->print(&Apache::loncommon::end_data_table_row());
     }      }
   
 # -- display directory  # -- display directory
Line 1111  sub display_line { Line 1122  sub display_line {
  my $curdir = $startdir.$filecom[0].'/';   my $curdir = $startdir.$filecom[0].'/';
  my $anchor = $curdir;   my $anchor = $curdir;
  $anchor =~ s/\W//g;   $anchor =~ s/\W//g;
  $r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");  #SB $r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
           $r->print(&Apache::loncommon::start_data_table_row()); # SB: bgcolor suggestion: darkgrey ("LC_info_row"?!?)
   # $r->print('<tr class="LC_info_row">');
           $r->print($extrafield.'<td valign="'.$valign.'">');
  &begin_form ($r,$curdir);   &begin_form ($r,$curdir);
  my $indentm1 = $indent-1;   my $indentm1 = $indent-1;
  if ($indentm1 < 11 and $indentm1 > 0) {   if ($indentm1 < 11 and $indentm1 > 0) {
Line 1149  sub display_line { Line 1163  sub display_line {
     $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).      $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
       ' </td>'."\n");        ' </td>'."\n");
  }   }
  $r->print('<td align=right> ',   $r->print('<td align="right"> ',
   $filecom[8]," </td>\n")     $filecom[8]," </td>\n") 
     if $hash{'display_attrs_1'} == 1;      if $hash{'display_attrs_1'} == 1;
  $r->print('<td> '.   $r->print('<td> '.
   (localtime($filecom[9]))." </td>\n")                     (&Apache::lonlocal::locallocaltime($filecom[9]))." </td>\n")
     if $hash{'display_attrs_2'} == 1;      if $hash{'display_attrs_2'} == 1;
  $r->print('<td> '.   $r->print('<td> '.
   (localtime($filecom[10]))." </td>\n")                     (&Apache::lonlocal::locallocaltime($filecom[10]))." </td>\n")
     if $hash{'display_attrs_3'} == 1;      if $hash{'display_attrs_3'} == 1;
   
  if ($hash{'display_attrs_4'} == 1) {   if ($hash{'display_attrs_4'} == 1) {
Line 1188  sub display_line { Line 1202  sub display_line {
  if ($hash{'display_attrs_7'} == 1) {   if ($hash{'display_attrs_7'} == 1) {
    $r->print('<td>&nbsp;</td>');     $r->print('<td>&nbsp;</td>');
         }          }
  $r->print('</tr>');          $r->print(&Apache::loncommon::end_data_table_row());
     }      }
   
 }  }
Removed from v.1.178  
changed lines
  Added in v.1.182

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>