Diff for /loncom/interface/lonindexer.pm between versions 1.133 and 1.138

version 1.133, 2005/04/07 06:56:23 version 1.138, 2006/02/07 19:46:30
Line 347  END Line 347  END
  }   }
   
 # ---------------------------------------------------------------- Print Header  # ---------------------------------------------------------------- Print Header
  my $html='<html>';#&Apache::lonxml::xmlbegin();   my $html=&Apache::lonxml::xmlbegin();
  $r->print(<<ENDHEADER);   $r->print(<<ENDHEADER);
 $html  $html
 <head>  <head>
Line 829  sub display_line { Line 829  sub display_line {
  $r->print ('<input src="'.$iconpath.'arrow_up.gif"');   $r->print ('<input src="'.$iconpath.'arrow_up.gif"');
  $r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.   $r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
    "\n");     "\n");
  $r->print(&mt("Up")."</form> $tabtag</tr>\n");   $r->print(&mt("Up")."</form>$tabtag</tr>\n");
  return OK;   return OK;
     }      }
 # Do we have permission to look at this?  # Do we have permission to look at this?
Line 863  sub display_line { Line 863  sub display_line {
     $r->print("(".$Apache::lonnet::domaindescription{$listname}.      $r->print("(".$Apache::lonnet::domaindescription{$listname}.
       ")");        ")");
  }   }
  $r->print ("</form> $tabtag</tr>\n");   $r->print ("</form>$tabtag</tr>\n");
  return OK;   return OK;
   
 # display user directory  # display user directory
Line 928  sub display_line { Line 928  sub display_line {
  $r->print("checked");   $r->print("checked");
     }      }
     $r->print(" />\n");      $r->print(" />\n");
     $r->print("</form>\n");      $r->print("</form></td><td nowrap>");
     $r->print("</td><td nowrap>");  
     $hash{"pre_${fnum}_link"}=$filelink;      $hash{"pre_${fnum}_link"}=$filelink;
      $fnum++;       $fnum++;
  }   }
Line 970  sub display_line { Line 969  sub display_line {
  }   }
 # Filetype icons  # Filetype icons
  $r->print("<img src='$iconname' border='0' />\n");   $r->print("<img src='$iconname' border='0' />\n");
 # Close form to open/close sequence  
  if ($filelink=~/\.(page|sequence)$/) {  
     $r->print('</form>');  
  }  
  my $quotable_filelink = &Apache::loncommon::escape_single($filelink);   my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
   
   
Line 984  sub display_line { Line 979  sub display_line {
  $r->print (" (<a href=\"javascript:openWindow('".$quotable_filelink.   $r->print (" (<a href=\"javascript:openWindow('".$quotable_filelink.
    ".meta', 'metadatafile', '500', '550', 'no', 'yes','no')\"; ".     ".meta', 'metadatafile', '500', '550', 'no', 'yes','no')\"; ".
    "TARGET=_self>metadata</a>) ");     "TARGET=_self>metadata</a>) ");
   # Close form to open/close sequence
    if ($filelink=~/\.(page|sequence)$/) {
       $r->print('</form>');
    }
  $r->print("</td>\n");   $r->print("</td>\n");
  if ($hash{'display_attrs_0'} == 1) {   if ($hash{'display_attrs_0'} == 1) {
     my $title = &Apache::lonnet::gettitle($filelink,'title');      my $title = &Apache::lonnet::gettitle($filelink,'title');
Line 1074  sub display_line { Line 1073  sub display_line {
     close(FH);      close(FH);
  } else {   } else {
     $output=&Apache::lonnet::ssi_body($filelink);      $output=&Apache::lonnet::ssi_body($filelink);
     open(FH,">$cache");      if ($output=~/LONCAPAACCESSCONTROLERRORSCREEN/) {
     print FH $output;   $output='';
     close(FH);      } else {
    open(FH,">$cache");
    print FH $output;
    close(FH);
       }
  }   }
  $output='<font size="-2">'.$output.'</font>';   $output='<font size="-2">'.$output.'</font>';
    } elsif ($embstyle eq 'img') {     } elsif ($embstyle eq 'img') {
Line 1238  sub cleanup { Line 1241  sub cleanup {
     if (tied(%hash)){      if (tied(%hash)){
  &Apache::lonnet::logthis('Cleanup indexer: hash');   &Apache::lonnet::logthis('Cleanup indexer: hash');
     }      }
       return OK;
 }  }
   
   

Removed from v.1.133  
changed lines
  Added in v.1.138


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