Diff for /loncom/interface/lonindexer.pm between versions 1.181.6.2 and 1.196

version 1.181.6.2, 2009/12/02 18:22:20 version 1.196, 2009/04/07 20:12:06
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 class="LC_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' ";
             my $cl=&mt('Close');              my $cl=&mt('Close');
             $closebutton=<<END;              $closebutton=<<END;
 <input type="button" name="close" value='$cl' onclick="self.close()" />  <input type="button" name="close" value='$cl' onClick="self.close()" />
 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 class="LC_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' ";
     my $cl=&mt('Close');      my $cl=&mt('Close');
             my $gi=&mt('Import');              my $gi=&mt('Import');
             $closebutton=<<END;              $closebutton=<<END;
 <input type="button" name="close" value='$cl' onclick="self.close()" />  <input type="button" name="close" value='$cl' onClick="self.close()" />
 END  END
             $groupimportbutton=<<END;              $groupimportbutton=<<END;
 <input type="button" name="groupimport" value='$gi'  <input type="button" name="groupimport" value='$gi'
 onclick="javascript:select_group()" />  onClick="javascript:select_group()" />
 END  END
         }          }
  # Additions made by Matthew to make the browser a little easier to deal   # Additions made by Matthew to make the browser a little easier to deal
Line 407  function gothere(val) { Line 409  function gothere(val) {
 ENDHEADER  ENDHEADER
   
         my ($headerdom)=($uri=~m{^/res/($match_domain)/});          my ($headerdom)=($uri=~m{^/res/($match_domain)/});
         my %args = (   $r->print(&Apache::loncommon::start_page('Content Library',$js,
                       'domain' => $headerdom,   {'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  # ---------------------------------- get state of file types to be showing
  if ($env{'form.only'}) {   if ($env{'form.only'}) {
     $typeselect = $env{'form.only'};      $typeselect = $env{'form.only'};
Line 427  ENDHEADER Line 423  ENDHEADER
     for (my $i=0; $i<=16; $i++) {      for (my $i=0; $i<=16; $i++) {
  delete $hash{'display_attrs_'.$i};   delete $hash{'display_attrs_'.$i};
  if ($env{'form.attr'.$i} == 1) {   if ($env{'form.attr'.$i} == 1) {
     $attrchk[$i] = 'checked="checked"';      $attrchk[$i] = 'checked';
     $hash{'display_attrs_'.$i} = 1;      $hash{'display_attrs_'.$i} = 1;
  }   }
     }      }
  } else {   } else {
     for (my $i=0; $i<=16; $i++) {      for (my $i=0; $i<=16; $i++) {
  $attrchk[$i] = 'checked="checked"' if $hash{'display_attrs_'.$i} == 1;   $attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
     }      }
  }   }
   
Line 448  ENDHEADER Line 444  ENDHEADER
    'st' => 'Statistics',     'st' => 'Statistics',
    'au' => 'Author',     'au' => 'Author',
    'kw' => 'Keywords',     'kw' => 'Keywords',
                                            'sb' => 'Subject',     'sb' => 'Subject',
                                            'nt' => 'Notes',     'nt' => 'Notes',
                                            'ab' => 'Abstract',     'ab' => 'Abstract',
    'ln' => 'Language',     'ln' => 'Language',
                                            'gl' => 'Grade Level',     'gl' => 'Grade Level',
                                            'sd' => 'Standards',     'sd' => 'Standards',
    'sa' => 'Source Available',     'sa' => 'Source Available',
    'sr' => 'Show resource',     'sr' => 'Show resource',
    'li' => 'Linked/Related Resources',     'li' => 'Linked/Related Resources',
Line 462  ENDHEADER Line 458  ENDHEADER
    'pr' => 'Problems',     'pr' => 'Problems',
    'gr' => 'Graphics',     'gr' => 'Graphics',
    'at' => 'All types',     'at' => 'All types',
                                            'hd' => 'Display Options',     'hd' => 'Display Options'
    );     );
  $r->print(<<END);   $r->print(<<END);
 <fieldset>  <fieldset>
 <legend>$lt{'hd'}</legend>  <legend>$lt{'hd'}</legend>
 <form method="post" name="fileattr" action="$uri" enctype="application/x-www-form-urlencoded">  <form method="post" name="fileattr" action="$uri"
 <label><input type="checkbox" name="attr9" value="1" $attrchk[9] onclick="this.form.submit();" /> $lt{'av'}</label>   enctype="application/x-www-form-urlencoded">
   <label><input type="checkbox" name="attr9" value="1" $attrchk[9] onClick="this.form.submit();" /> $lt{'av'}</label>
 <table border="0">  <table border="0">
 <tr>  <tr>
 <td><label><input type="checkbox" name="attr0" value="1" $attrchk[0] onclick="this.form.submit();" /> $lt{'ti'}</label></td>  <td><label><input type="checkbox" name="attr0" value="1" $attrchk[0] onClick="this.form.submit();" /> $lt{'ti'}</label></td>
 <td><label><input type="checkbox" name="attr4" value="1" $attrchk[4] onclick="this.form.submit();" /> $lt{'au'}</label></td>  <td><label><input type="checkbox" name="attr4" value="1" $attrchk[4] onClick="this.form.submit();" /> $lt{'au'}</label></td>
 <td><label><input type="checkbox" name="attr5" value="1" $attrchk[5] onclick="this.form.submit();" /> $lt{'kw'}</label></td>  <td><label><input type="checkbox" name="attr5" value="1" $attrchk[5] onClick="this.form.submit();" /> $lt{'kw'}</label></td>
 <td><label><input type="checkbox" name="attr6" value="1" $attrchk[6] onclick="this.form.submit();" /> $lt{'ln'}</label></td>  <td><label><input type="checkbox" name="attr6" value="1" $attrchk[6] onClick="this.form.submit();" /> $lt{'ln'}</label></td>
 <td><label><input type="checkbox" name="attr13" value="1" $attrchk[13] onclick="this.form.submit();" /> $lt{'nt'}</label></td>  <td><label><input type="checkbox" name="attr13" value="1" $attrchk[13] onClick="this.form.submit();" /> $lt{'nt'}</label></td>
 <td><label><input type="checkbox" name="attr16" value="1" $attrchk[16] onclick="this.form.submit();" /> $lt{'sd'}</label></td>  <td><label><input type="checkbox" name="attr16" value="1" $attrchk[16] onClick="this.form.submit();" /> $lt{'sd'}</label></td>
 </tr>  </tr>
 <tr>  <tr>
 <td><label><input type="checkbox" name="attr1" value="1" $attrchk[1] onclick="this.form.submit();" /> $lt{'si'}</label></td>  <td><label><input type="checkbox" name="attr1" value="1" $attrchk[1] onClick="this.form.submit();" /> $lt{'si'}</label></td>
 <td><label><input type="checkbox" name="attr2" value="1" $attrchk[2] onclick="this.form.submit();" /> $lt{'la'}</label></td>  <td><label><input type="checkbox" name="attr2" value="1" $attrchk[2] onClick="this.form.submit();" /> $lt{'la'}</label></td>
 <td><label><input type="checkbox" name="attr3" value="1" $attrchk[3] onclick="this.form.submit();" /> $lt{'lm'}</label></td>  <td><label><input type="checkbox" name="attr3" value="1" $attrchk[3] onClick="this.form.submit();" /> $lt{'lm'}</label></td>
 <td><label><input type="checkbox" name="attr10" value="1" $attrchk[10] onclick="this.form.submit();" /> $lt{'sa'}</label></td>  <td><label><input type="checkbox" name="attr10" value="1" $attrchk[10] onClick="this.form.submit();" /> $lt{'sa'}</label></td>
 <td><label><input type="checkbox" name="attr14" value="1" $attrchk[14] onclick="this.form.submit();" /> $lt{'ab'}</label></td>  <td><label><input type="checkbox" name="attr14" value="1" $attrchk[14] onClick="this.form.submit();" /> $lt{'ab'}</label></td>
 <td>&nbsp;</td>  <td>&nbsp;</td>
 </tr>  </tr>
 <tr>  <tr>
 <td><label><input type="checkbox" name="attr8" value="1" $attrchk[8] onclick="this.form.submit();" /> $lt{'st'}</label></td>  <td><label><input type="checkbox" name="attr8" value="1" $attrchk[8] onClick="this.form.submit();" /> $lt{'st'}</label></td>
 <td><label><input type="checkbox" name="attr11" value="1" $attrchk[11] onclick="this.form.submit();" /> $lt{'li'}</label></td>  <td><label><input type="checkbox" name="attr11" value="1" $attrchk[11] onClick="this.form.submit();" /> $lt{'li'}</label></td>
 <td><label><input type="checkbox" name="attr7" value="1" $attrchk[7] onclick="this.form.submit();" /> $lt{'sr'}</label></td>  <td><label><input type="checkbox" name="attr7" value="1" $attrchk[7] onClick="this.form.submit();" /> $lt{'sr'}</label></td>
 <td><label><input type="checkbox" name="attr12" value="1" $attrchk[12] onclick="this.form.submit();" /> $lt{'sb'}</label></td>  <td><label><input type="checkbox" name="attr12" value="1" $attrchk[12] onClick="this.form.submit();" /> $lt{'sb'}</label></td>
 <td><label><input type="checkbox" name="attr15" value="1" $attrchk[15] onclick="this.form.submit();" /> $lt{'gl'}</label></td>  <td><label><input type="checkbox" name="attr15" value="1" $attrchk[15] onClick="this.form.submit();" /> $lt{'gl'}</label></td>
 <td>&nbsp;</td>  <td>&nbsp;</td>
 </tr>  </tr>
 </table>  </table>
Line 535  END Line 532  END
 # -------------------------------------------------------- Resource Home Button  # -------------------------------------------------------- Resource Home Button
  my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'};   my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'};
  if ($reshome) {   if ($reshome) {
     $r->print("<font size='+2'><a href='");      $r->print("<span class=\"LC_fontsize_large\"><a href='");
     if ($env{'form.catalogmode'} eq 'import') {      if ($env{'form.catalogmode'} eq 'import') {
  $r->print('javascript:document.forms.fileattr.action="'.&Apache::loncommon::inhibit_menu_check($reshome).'";document.forms.fileattr.submit();');   $r->print('javascript:document.forms.fileattr.action="'.&Apache::loncommon::inhibit_menu_check($reshome).'";document.forms.fileattr.submit();');
     } else {      } else {
  $r->print($reshome);   $r->print($reshome);
     }      }
     $r->print("'>".&mt('Home').'</a></font>');      $r->print("'>".&mt('Home').'</a></span>');
  }   }
  $r->print('</form>');   $r->print('</form>');
 # ------------------------------------------------------ Remember where we were  # ------------------------------------------------------ Remember where we were
Line 549  END Line 546  END
  &Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);   &Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);
 # -------------------------------------------------- Check All and Uncheck all  # -------------------------------------------------- Check All and Uncheck all
  if ($env{'form.catalogmode'} eq 'import') {   if ($env{'form.catalogmode'} eq 'import') {
     $r->print('<br /><input type="button" value="'.&mt("Check All").'" id="checkallbutton" onclick="javascript:checkAll()" />');      $r->print('<br /><input type="button" value="'.&mt("Check All").'" id="checkallbutton" onClick="javascript:checkAll()" />');
     $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("LC_tableBrowseRes")
  $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 class="LC_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("<th>".&mt("Subject")."</th>\n")   $r->print("<th>".&mt("Subject")."</th>\n")
             if ($hash{'display_attrs_12'} == 1);      if ($hash{'display_attrs_12'} == 1);
         $r->print("<th>".&mt("Notes")."</th>\n")   $r->print("<th>".&mt("Notes")."</th>\n")
             if ($hash{'display_attrs_13'} == 1);      if ($hash{'display_attrs_13'} == 1);
         $r->print("<th>".&mt("Abstract")."</th>\n")   $r->print("<th>".&mt("Abstract")."</th>\n")
             if ($hash{'display_attrs_14'} == 1);      if ($hash{'display_attrs_14'} == 1);
         $r->print("<th>".&mt("Grade Level")."</th>\n")   $r->print("<th>".&mt("Grade Level")."</th>\n")
             if ($hash{'display_attrs_15'} == 1);      if ($hash{'display_attrs_15'} == 1);
         $r->print("<th>".&mt("Standards")."</th>\n")   $r->print("<th>".&mt("Standards")."</th>\n")
             if ($hash{'display_attrs_16'} == 1);      if ($hash{'display_attrs_16'} == 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 643  END Line 643  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 848  sub display_line { Line 846  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 857  sub display_line { Line 855  sub display_line {
     my $fnptr = $filecom[3]&$dirptr;      my $fnptr = $filecom[3]&$dirptr;
     my $msg = &mt('View').' '.$filecom[0].' '.&mt('resources');      my $msg = &mt('View').' '.$filecom[0].' '.&mt('resources');
     $msg = &mt('Close').' '.$filecom[0].' '.&mt('directory') if $diropen eq 'opened';      $msg = &mt('Close').' '.$filecom[0].' '.&mt('directory') if $diropen eq 'opened';
       my $nowOpen = ($diropen eq 'opened' ? 1 : 0);
   
     my $tabtag='</td>';      my $tabtag='</td>';
     my $i=0;      my $i=0;
Line 875  sub display_line { Line 874  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.
    '/" '.     '/" '.
    'onsubmit="return rep_dirpath(\'UP\','.     'onSubmit="return rep_dirpath(\'UP\','.
    'document.forms.fileattr.acts.value)" '.     'document.forms.fileattr.acts.value)" '.
    'enctype="application/x-www-form-urlencoded"'.     'enctype="application/x-www-form-urlencoded"'.
                    '>'."\n");                     '>'."\n");
  $r->print(&Apache::loncommon::inhibit_menu_check('input'));   $r->print(&Apache::loncommon::inhibit_menu_check('input'));
  $r->print ('<input type="hidden" name="openuri" value="'.   $r->print ('<input type=hidden name=openuri value="'.
    $startdir.'" />'."\n");     $startdir.'" />'."\n");
  $r->print ('<input type="hidden" name="acts" value="" />'."\n");          $r->print ('<input type="hidden" name="acts" value="" />'."\n");
  $r->print ('<input src="'.$iconpath.'arrow_up.gif"');   $r->print ('<a href="#" onClick="document.dirpathUP.submit()"><img src="'.$iconpath.'arrow.up.gif"');
  $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'.   $r->print (' name="'.$msg.'" type="image" class="LC_fileicon" />'.
    "\n");     "\n");
  $r->print(&mt("Up")."</form>$tabtag</tr>\n");   $r->print(&mt("Up")."</a></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 898  sub display_line { Line 900  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];
  $anchor =~ s/\W//g;   $anchor =~ s/\W//g;
  $r->print ('<a name="'.$anchor.'"></a>');   $r->print ('<a name="'.$anchor.'"></a>');
  $r->print ('<input type="hidden" name="acts" value="" />');  $r->print ('<input type="hidden" name="acts" value="" />');
  $r->print ('<input src="'.$iconpath.'folder_pointer_'.   $r->print ('<a href="#" onClick="document.dirpath'.($dnum-1).'.submit()"><img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).'.gif"'); 
    $diropen.'.gif"');    $r->print (' name="'.$msg.'" type="image" class="LC_fileicon" /></a>'.
  $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'.  
    "\n");     "\n");
  my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);   my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);
  $r->print ('<a href="javascript:gothere(\''.$quotable_filecom.   $r->print ('<a href="javascript:gothere(\''.$quotable_filecom.
    '\')"><img alt="" src="'.$iconpath.'server.gif"');     '\')"><img alt="" src="'.$iconpath.'server.gif"');
  $r->print (' class="LC_icon" /></a>'."\n");   $r->print (' class="LC_fileicon" />'."\n");
  $r->print (&mt("Domain")." - $listname ");   $r->print (&mt("Domain")." - $listname </a>");
  if (&Apache::lonnet::domain($listname,'description')) {   if (&Apache::lonnet::domain($listname,'description')) {
     $r->print("(".&Apache::lonnet::domain($listname,'description').      $r->print("<br />(".&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 934  sub display_line { Line 938  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 class="LC_'.$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");     'whitespace_21.gif" class="LC_icon" />'."\n");
  $r->print ('<input type="hidden" name="acts" value="" />');   $r->print ('<input type="hidden" name="acts" value="" />');
  $r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.   $r->print ('<a href="#" onClick="document.dirpath'.($dnum-1).'.submit()">');
    '.gif"');           $r->print ('<img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).
  $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'.     '.gif" class="LC_fileicon"'); 
    $r->print (' name="'.$msg.'"/></a>'.
    "\n");     "\n");
  my $quotable_curdir = &Apache::loncommon::escape_single($curdir);   my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
  $r->print ('<a href="javascript:gothere(\''.$quotable_curdir   $r->print ('<a href="javascript:gothere(\''.$quotable_curdir
    .'\')"><img alt="'.$msg.'" src="'.     .'\')"><img alt="'.$msg.'" src="'.
    $iconpath.'quill.gif" class="LC_indexer_icon" /></a>');     $iconpath.'quill.gif" class="LC_fileicon" />');
  my $domain=(split(m|/|,$startdir))[2];   my $domain=(split(m|/|,$startdir))[2];
  my $plainname=&Apache::loncommon::plainname($listname,$domain);   my $plainname=&Apache::loncommon::plainname($listname,$domain);
  $r->print ($listname);          $r->print ($listname.'</a>');
  if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }  
  $r->print ('</form>'.$tabtag.'</tr>'."\n");          if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
  return OK;          $r->print('</form>'.$tabtag);
           $r->print(&Apache::loncommon::end_data_table_row());
           return OK;
     }      }
   
 # display file  # display file
     if (($fnptr == 0 and $filecom[3] ne '') or $absolute) {          if (($fnptr == 0 and $filecom[3] ne '') or $absolute) {
         my $title;              my $title;
  my $filelink = $pathprefix.$filecom[0];              my $filelink = $pathprefix.$filecom[0];
  if ($hash{'display_attrs_0'} == 1) {              if ($hash{'display_attrs_0'} == 1) {
     $title = &Apache::lonnet::gettitle($filelink);                  $title = &Apache::lonnet::gettitle($filelink);
  }              }
  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 (lc($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 (lc($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.'">'.  #SB $r->print("<tr valign='$valign' bgcolor=\"$fileclr\">);
                   '<td valign="top"><span class="LC_nobreak">');          $r->print(&Apache::loncommon::start_data_table_row()); #SB valign="$valign" ?!?
           $r->print('<td class="LC_middle LC_nobreak">');
   
         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 983  sub display_line { Line 993  sub display_line {
                       $quotable_filelink,"')\">");                        $quotable_filelink,"')\">");
     $r->print("<img alt=\"\" src='",$iconpath,"select.gif' class='LC_icon' /></a>".      $r->print("<img alt=\"\" src='",$iconpath,"select.gif' class='LC_icon' /></a>".
       "\n");        "\n");
     $r->print('</span></td><td valign="top"><span class="LC_nobreak">');      $r->print('</td><td class="LC_middle"><span class="LC_nobreak">');
  } elsif ($env{'form.catalogmode'} eq 'import') {   } elsif ($env{'form.catalogmode'} eq 'import') {
     $r->print("<form name='form$fnum' action=''>\n");      $r->print("<form name='form$fnum' action=''>\n");
     $r->print("<input type='checkbox' name='filelink"."' ".      $r->print("<input type='checkbox' name='filelink"."' ".
       "value='$filelink' onclick='".        "value='$filelink' onClick='".
       "javascript:queue(\"form$fnum\")' ");        "javascript:queue(\"form$fnum\")' ");
     if ($hash{'store_'.$filelink}) {      if ($hash{'store_'.$filelink}) {
  $r->print("checked");   $r->print("checked");
     }      }
     $r->print(" />\n");      $r->print(" />\n");
     $r->print('</form></span></td><td valign="top"><span class="LC_nobreak">');      $r->print('</form></td><td class="LC_middle"><span class="LC_nobreak">');
     $hash{"pre_${fnum}_link"}=$filelink;      $hash{"pre_${fnum}_link"}=$filelink;
     $hash{"pre_${fnum}_title"}=$title;      $hash{"pre_${fnum}_title"}=$title;
     if (!$hash{"pre_${fnum}_title"}) {      if (!$hash{"pre_${fnum}_title"}) {
Line 1008  sub display_line { Line 1018  sub display_line {
     $indent--;      $indent--;
  }   }
 # General indentation  # General indentation
  if ($indent > 0 and $indent < 16) {  
     $r->print("<img alt=\"\" src='",$iconpath,"whitespace",$indent,  
       ".gif' class='LC_icon' />\n");  
  } elsif ($indent >0) {  
     my $ten = int($indent/10.);  
     my $rem = $indent%10.0;  
     my $count = 0;      my $count = 0;
     while ($count < $ten) {      while ($count < $indent) {
  $r->print("<img alt=\"\" src=".$iconpath.   $r->print("<img alt=\"\" src=".$iconpath.
   "whitespace10.gif class='LC_icon' />\n");    "whitespace_21.gif class='LC_icon' />\n");
     $count++;          $count++;
     }      }
     $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$rem,  
       ".gif class='LC_icon' />\n") if $rem > 0;  
  }  
 # Sequence open/close icon  # Sequence open/close icon
  if ($filelink=~/\.(page|sequence)$/) {   if ($filelink=~/\.(page|sequence)$/) {
     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 ('<input type="hidden" name="acts" value="" />');      $r->print ('<input type="hidden" name="acts" value="" />');
     $r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.      $r->print ('<a name="'.$anchor.'"></a>');
        'folder_pointer_'.$diropen.'.gif"');              $r->print ('<a href="#" onClick="document.dirpath'.($dnum-1).'.submit()">');
     $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'.              $r->print ('<img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).
                          '.gif" class="LC_fileicon"');
       $r->print (' name="'.$msg.'" type="image" class="LC_fileicon" /></a>'.
        "\n");         "\n");
  }   }
 # Filetype icons  # Filetype icons
  $r->print("<img alt=\"\" src='$iconname' class='LC_icon' />\n");   $r->print("<img alt=\"\" src='$iconname' class='LC_fileicon' />\n");
  my $quotable_filelink = &Apache::loncommon::escape_single($filelink);   my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
   
  $r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.   $r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.
Line 1055  sub display_line { Line 1058  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 class="LC_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 class="LC_nobreak"> '.
                   (&Apache::lonlocal::locallocaltime($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 class="LC_nobreak"> '.
                   (&Apache::lonlocal::locallocaltime($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) {
     my $author = &Apache::lonnet::metadata($filelink,'author');      my $author = &Apache::lonnet::metadata($filelink,'author');
     $r->print('<td> '.($author eq '' ? '&nbsp;' : $author).      $r->print('<td class="LC_nobreak"> '.($author eq '' ? '&nbsp;' : $author).
       " </td>\n");        " </td>\n");
  }   }
  if ($hash{'display_attrs_5'} == 1) {   if ($hash{'display_attrs_5'} == 1) {
Line 1076  sub display_line { Line 1079  sub display_line {
     $r->print('<td> '.($keywords eq '' ? '&nbsp;' : $keywords).      $r->print('<td> '.($keywords eq '' ? '&nbsp;' : $keywords).
       " </td>\n");        " </td>\n");
  }   }
 #'  
   
  if ($hash{'display_attrs_6'} == 1) {   if ($hash{'display_attrs_6'} == 1) {
     my $lang = &Apache::lonnet::metadata($filelink,'language');      my $lang = &Apache::lonnet::metadata($filelink,'language');
Line 1088  sub display_line { Line 1090  sub display_line {
 # statistics  # statistics
     &dynmetaread($filelink);      &dynmetaread($filelink);
     $r->print("<td>");      $r->print("<td>");
             for (qw(count course stdno avetries difficulty disc clear technical  
                 correct helpful depth)) {  
   
                 &dynmetaprint($r,$filelink,$_);          for (qw(count course stdno avetries difficulty disc clear technical
             }              correct helpful depth)) {
   
               dynmetaprint($r,$filelink,$_);
           }
   
     $r->print("&nbsp;</td>\n");      $r->print("&nbsp;</td>\n");
   
  }   }
Line 1115  sub display_line { Line 1119  sub display_line {
    &dynmetaread($filelink);     &dynmetaread($filelink);
    $r->print('<td>');     $r->print('<td>');
    &coursecontext($r,$filelink);     &coursecontext($r,$filelink);
            for (qw(goto_list comefrom_list sequsage_list dependencies course_list)) {         for (qw(goto_list comefrom_list sequsage_list dependencies course_list)) {
                &dynmetaprint($r,$filelink,$_);               dynmetaprint($r,$filelink,$_);
            }         }
            $r->print('</td>');     $r->print('</td>');
         }          }
         if ($hash{'display_attrs_7'} == 1) {          
      
   
    if ($hash{'display_attrs_7'} == 1) {
 # Show resource  # Show resource
    my $output=&showpreview($filelink);     my $output=&showpreview($filelink);
            $r->print('<td> '.($output eq '' ? '&nbsp;':$output).             $r->print('<td> '.($output eq '' ? '&nbsp;':$output).
       " </td>\n");        " </td>\n");
         }  
         if ($hash{'display_attrs_12'} == 1) {  
             my $subject = &Apache::lonnet::metadata($filelink,'subject');  
             $r->print('<td> '.($subject eq '' ? '&nbsp;' : $subject).  
                       " </td>\n");  
         }  
   
         if ($hash{'display_attrs_13'} == 1) {  
             my $notes = &Apache::lonnet::metadata($filelink,'notes');  
             $r->print('<td> '.($notes eq '' ? '&nbsp;' : $notes).  
                       " </td>\n");  
         }  
   
         if ($hash{'display_attrs_14'} == 1) {  
             my $abstract = &Apache::lonnet::metadata($filelink,'abstract');  
             $r->print('<td> '.($abstract eq '' ? '&nbsp;' : $abstract).  
                       " </td>\n");  
         }  
   
         if ($hash{'display_attrs_15'} == 1) {  
             my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');  
             $r->print('<td> '.($gradelevel eq '' ? '&nbsp;' : $gradelevel).  
                       " </td>\n");  
         }  
   
         if ($hash{'display_attrs_16'} == 1) {  
             my $standards = &Apache::lonnet::metadata($filelink,'standards');  
             $r->print('<td> '.($standards eq '' ? '&nbsp;' : $standards).  
                       " </td>\n");  
         }  
   
  $r->print("</tr>\n");  
     }      }
       
       if ($hash{'display_attrs_12'} == 1) {
       my $subject = &Apache::lonnet::metadata($filelink,'subject');
       $r->print('<td> '.($subject eq '' ? '&nbsp;' : $subject).
         " </td>\n");
    }
   
    if ($hash{'display_attrs_13'} == 1) {
       my $notes = &Apache::lonnet::metadata($filelink,'notes');
       $r->print('<td> '.($notes eq '' ? '&nbsp;' : $notes).
         " </td>\n");
    }
   
    if ($hash{'display_attrs_14'} == 1) {
       my $abstract = &Apache::lonnet::metadata($filelink,'abstract');
       $r->print('<td> '.($abstract eq '' ? '&nbsp;' : $abstract).
         " </td>\n");
    }
   
    if ($hash{'display_attrs_15'} == 1) {
       my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');
       $r->print('<td> '.($gradelevel eq '' ? '&nbsp;' : $gradelevel).
         " </td>\n");
    }
   
    if ($hash{'display_attrs_16'} == 1) {
       my $standards = &Apache::lonnet::metadata($filelink,'standards');
       $r->print('<td> '.($standards eq '' ? '&nbsp;' : $standards).
         " </td>\n");
    }
   
    $r->print(&Apache::loncommon::end_data_table_row());
   }
       
       
   
 # -- display directory  # -- display directory
     if ($fnptr == $dirptr) {      if ($fnptr == $dirptr) {
  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 class="LC_middle LC_nobreak">');
  &begin_form ($r,$curdir);   &begin_form ($r,$curdir);
  my $indentm1 = $indent-1;   my $indentm1 = $indent-1;
  if ($indentm1 < 16 and $indentm1 > 0) {   my $count = 0;
     $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$indentm1,   while ($count < $indentm1) {
       ".gif class='LC_icon' />\n");      $r->print ("<img alt=\"\" src=",$iconpath
  } else {                 ,"whitespace_21.gif class='LC_icon' />\n");
     my $ten = int($indentm1/10.);              $count++;
     my $rem = $indentm1%10.0;  
     my $count = 0;  
     while ($count < $ten) {  
  $r->print ("<img alt=\"\" src=",$iconpath  
    ,"whitespace10.gif class='LC_icon' />\n");  
  $count++;  
     }  
     $r->print ("<img alt=\"\" src=",$iconpath,"whitespace",$rem,  
        ".gif class='LC_icon' />\n") if $rem > 0;  
  }   }
  $r->print ('<input type="hidden" name="acts" value="" />');   $r->print ('<input type="hidden" name="acts" value="" />');
  $r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.   $r->print ('<a name="'.$anchor.'"></a>');
    'folder_pointer_'.$diropen.'.gif"');          $r->print ('<a href="#" onClick="document.dirpath'.($dnum-1).'.submit()"><img src="'.$iconpath.
  $r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'.     'arrow.'.($nowOpen ? "open" : "closed" ).'.gif"');
    $r->print (' name="'.$msg.'" class="LC_fileicon" /></a>'.
    "\n");     "\n");
  my $quotable_curdir = &Apache::loncommon::escape_single($curdir);   my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
  $r->print ('<a href="javascript:gothere(\''          
    .$quotable_curdir.'\')">'          my $location = &Apache::loncommon::lonhttpdurl("/adm/lonIcons");
    .'<img alt="'.&mt('Open Folder').'"src="'.   my $icon = "navmap.folder.".($nowOpen ? "open":"closed").'.gif';
    $iconpath.'folder_'.$diropen.'.gif" class="LC_icon" /></a>'.          $r->print ('<a href="javascript:gothere(\''
    "\n");     .$quotable_curdir.'\')"">'
  $r->print ("$listname</form></td>\n");     .'<img class="LC_fileicon" alt="'.&mt('Open Folder').'" src="'.
                      $location."/".$icon.'" />'.
                      "\n");
    $r->print ("$listname</a></form></td>\n");
 # Attributes  # Attributes
  my $filelink = $startdir.$filecom[0].'/default';   my $filelink = $startdir.$filecom[0].'/default';
   
Line 1202  sub display_line { Line 1210  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 class="LC_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 class="LC_break"> '.
                   (&Apache::lonlocal::locallocaltime($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 class="LC_break"> '.
                   (&Apache::lonlocal::locallocaltime($filecom[10]))." </td>\n")                    (&Apache::lonlocal::locallocaltime($filecom[10]))." </td>\n")
     if $hash{'display_attrs_3'} == 1;      if $hash{'display_attrs_3'} == 1;
   
Line 1229  sub display_line { Line 1237  sub display_line {
     $r->print('<td> '.($lang eq '' ? '&nbsp;' : $lang).      $r->print('<td> '.($lang eq '' ? '&nbsp;' : $lang).
       " </td>\n");        " </td>\n");
  }   }
   
  if ($hash{'display_attrs_8'} == 1) {   if ($hash{'display_attrs_8'} == 1) {
    $r->print('<td>&nbsp;</td>');     $r->print('<td>&nbsp;</td>');
  }   }
Line 1237  sub display_line { Line 1246  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>');
         }      }     
         if ($hash{'display_attrs_12'} == 1) {      if ($hash{'display_attrs_11'} == 1) {
             my $subject = &Apache::lonnet::metadata($filelink,'subject');     $r->print('<td>&nbsp;</td>');
             $r->print('<td> '.($subject eq '' ? '&nbsp;' : $subject).   }
                       " </td>\n");   if ($hash{'display_attrs_12'} == 1) {
         }      my $subject = &Apache::lonnet::metadata($filelink,'subject');
         if ($hash{'display_attrs_11'} == 1) {      $r->print('<td> '.($subject eq '' ? '&nbsp;' : $subject).
             $r->print('<td>&nbsp;</td>');        " </td>\n");
         }   }
         if ($hash{'display_attrs_12'} == 1) {   if ($hash{'display_attrs_13'} == 1) {
             my $subject = &Apache::lonnet::metadata($filelink,'subject');      my $notes = &Apache::lonnet::metadata($filelink,'notes');
             $r->print('<td> '.($subject eq '' ? '&nbsp;' : $subject).      $r->print('<td> '.($notes eq '' ? '&nbsp;' : $notes).
                       " </td>\n");        " </td>\n");
         }   }
         if ($hash{'display_attrs_13'} == 1) {  
             my $notes = &Apache::lonnet::metadata($filelink,'notes');   if ($hash{'display_attrs_14'} == 1) {
             $r->print('<td> '.($notes eq '' ? '&nbsp;' : $notes).      my $abstract = &Apache::lonnet::metadata($filelink,'abstract');
                       " </td>\n");      $r->print('<td> '.($abstract eq '' ? '&nbsp;' : $abstract).
         }        " </td>\n");
         if ($hash{'display_attrs_14'} == 1) {   }
             my $abstract = &Apache::lonnet::metadata($filelink,'abstract');  
             $r->print('<td> '.($abstract eq '' ? '&nbsp;' : $abstract).   if ($hash{'display_attrs_15'} == 1) {
                       " </td>\n");      my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');
         }      $r->print('<td> '.($gradelevel eq '' ? '&nbsp;' : $gradelevel).
         if ($hash{'display_attrs_15'} == 1) {        " </td>\n");
             my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');   }
             $r->print('<td> '.($gradelevel eq '' ? '&nbsp;' : $gradelevel).  
                       " </td>\n");   if ($hash{'display_attrs_16'} == 1) {
         }      my $standards = &Apache::lonnet::metadata($filelink,'standards');
         if ($hash{'display_attrs_16'} == 1) {      $r->print('<td> '.($standards eq '' ? '&nbsp;' : $standards).
             my $standards = &Apache::lonnet::metadata($filelink,'standards');        " </td>\n");
             $r->print('<td> '.($standards eq '' ? '&nbsp;' : $standards).   }
                       " </td>\n");  
         }  
  $r->print('</tr>');   $r->print(&Apache::loncommon::end_data_table_row());
     }      }
   
 }  }
Line 1296  sub showpreview { Line 1305  sub showpreview {
     my $output='';      my $output='';
     my $embstyle=&Apache::loncommon::fileembstyle($curfext);      my $embstyle=&Apache::loncommon::fileembstyle($curfext);
     if ($embstyle eq 'ssi') {      if ($embstyle eq 'ssi') {
        my $cache = $Apache::lonnet::perlvar{'lonDocRoot'}.$filelink;         my $cache=$Apache::lonnet::perlvar{'lonDocRoot'}.$filelink.
        if ($env{'request.gcicontext'} eq 'buildtest') {                      '.tmp';
            $cache .= '.tn';   
        } else {  
            $cache .= '.tmp';  
        }  
        if ((!$env{'form.updatedisplay'}) &&         if ((!$env{'form.updatedisplay'}) &&
                     (-e $cache)) {                      (-e $cache)) {
           open(FH,$cache);            open(FH,$cache);
Line 1324  sub showpreview { Line 1329  sub showpreview {
              close(FH);               close(FH);
           }            }
        }         }
        $output='<font size="-2">'.$output.'</font>';         $output='<span class="LC_fontsize_medium">'.$output.'</span>';
     } elsif ($embstyle eq 'img') {      } elsif ($embstyle eq 'img') {
        $output='<img alt="'.&mt('Preview').'" src="'.$filelink.'" />';         $output='<img alt="'.&mt('Preview').'" src="'.$filelink.'" />';
     } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {      } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {
Line 1355  sub begin_form { Line 1360  sub begin_form {
     $uri=&Apache::loncommon::escape_single($uri);      $uri=&Apache::loncommon::escape_single($uri);
     $r->print ('<form method="post" name="dirpath'.$dnum.'" action="'.$uri.      $r->print ('<form method="post" name="dirpath'.$dnum.'" action="'.$uri.
        '#'.$anchor.         '#'.$anchor.
        '" onsubmit="return rep_dirpath(\''.$dnum.'\''.         '" onSubmit="return rep_dirpath(\''.$dnum.'\''.
        ',document.forms.fileattr.acts.value)" '.         ',document.forms.fileattr.acts.value)" '.
        'enctype="application/x-www-form-urlencoded">'."\n");         'enctype="application/x-www-form-urlencoded">'."\n");
     $r->print ('<input type="hidden" name="openuri" value="'.$uri.'" />'.      $r->print ('<input type="hidden" name="openuri" value="'.$uri.'" />'.

Removed from v.1.181.6.2  
changed lines
  Added in v.1.196


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