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

Diff for /loncom/interface/lonindexer.pm between versions 1.87 and 1.103

version 1.87, 2004/01/26 19:55:44 version 1.103, 2004/05/10 08:34:50
Line 47  use strict; Line 47  use strict;
 use Apache::lonnet();  use Apache::lonnet();
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
   use Apache::lonsequence();
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::lonmeta;  use Apache::lonmeta;
 use Apache::File;  use Apache::File;
Line 164  END Line 165  END
  #       selection is made.   #       selection is made.
  # $element is the name of the element in $formname which receives   # $element is the name of the element in $formname which receives
  #       the URL.   #       the URL.
  # &Apache::lonxml::debug('Checking mode, form, element');   #&Apache::lonxml::debug('Checking mode, form, element');
  &setvalues(\%hash,'form.mode'        ,\%ENV,'form.mode'   );   &setvalues(\%hash,'form.mode'        ,\%ENV,'form.mode'   );
  &setvalues(\%hash,'form.form'        ,\%ENV,'form.form'   );   &setvalues(\%hash,'form.form'        ,\%ENV,'form.form'   );
  &setvalues(\%hash,'form.element'     ,\%ENV,'form.element');   &setvalues(\%hash,'form.element'     ,\%ENV,'form.element');
Line 187  END Line 188  END
     $element      = $ENV{'form.element'};      $element      = $ENV{'form.element'};
     $titleelement = $ENV{'form.titleelement'};      $titleelement = $ENV{'form.titleelement'};
  }   }
  &Apache::lonxml::debug("mode=$mode form=$form element=$element   #&Apache::lonxml::debug("mode=$mode form=$form element=$element titleelement=$titleelement");
                                 titleelement=$titleelement");  
 # ------ set catalogmodefunctions to have extra needed javascript functionality  # ------ set catalogmodefunctions to have extra needed javascript functionality
  my $catalogmodefunctions='';   my $catalogmodefunctions='';
  if ($ENV{'form.catalogmode'} eq 'interactive' or   if ($ENV{'form.catalogmode'} eq 'interactive' or
Line 443  $r->print(&Apache::loncommon::bodytag('B Line 443  $r->print(&Apache::loncommon::bodytag('B
 <input type="hidden" name="acts" value="" />  <input type="hidden" name="acts" value="" />
 $closebutton $groupimportbutton  $closebutton $groupimportbutton
 END  END
   # -------------- Filter out sequence containment in crumbs and "recent folders"
    my $storeuri=$uri;
    $storeuri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1];
    $storeuri=~s/\/+/\//g;
 # ---------------------------------------------------------------- Bread crumbs  # ---------------------------------------------------------------- Bread crumbs
         $r->print(&Apache::lonhtmlcommon::crumbs($uri,'','',          $r->print(&Apache::lonhtmlcommon::crumbs($storeuri,'','',
  (($ENV{'form.catalogmode'} eq 'groupimport')?   (($ENV{'form.catalogmode'} eq 'groupimport')?
  'document.forms.fileattr':'')).   'document.forms.fileattr':'')).
   &Apache::lonhtmlcommon::select_recent('residx','resrecent',    &Apache::lonhtmlcommon::select_recent('residx','resrecent',
 'this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();').  'this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();'));
   '</form>');  # -------------------------------------------------------- Resource Home Button
    my $reshome=$ENV{'course.'.$ENV{'request.course.id'}.'.reshome'};
    if ($reshome) {
       $r->print("<font size='+2'><a href='");
       if ($ENV{'form.catalogmode'} eq 'groupimport') {
    $r->print('javascript:document.forms.fileattr.action="'.$reshome.'";document.forms.fileattr.submit();');
       } else {
    $r->print($reshome);
       }
       $r->print("'>".&mt('Home').'</a></font>');
    }
    $r->print('</form>');
 # ------------------------------------------------------ Remember where we were  # ------------------------------------------------------ Remember where we were
  &Apache::loncommon::storeresurl($uri);   &Apache::loncommon::storeresurl($storeuri);
  &Apache::lonhtmlcommon::store_recent('residx',$uri,$uri);   &Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);
 # ----------------- output starting row to the indexed file/directory hierarchy  # ----------------- output starting row to the indexed file/directory hierarchy
         my $titleclr="#ddffff";          my $titleclr="#ddffff";
 #        $r->print(&initdebug());  #        $r->print(&initdebug());
Line 511  END Line 526  END
  my $indent = 0;   my $indent = 0;
  $uri = $uri.'/' if $uri !~ /.*\/$/;   $uri = $uri.'/' if $uri !~ /.*\/$/;
   
     if ($ENV{'form.dirPointer'} ne 'on') {
  $hash{'top.level'} = $uri;       $hash{'top.level'} = $uri;
  $toplevel = $uri;       $toplevel = $uri;
     } else {
        $toplevel = $hash{'top.level'};
     }
   
 # -------------------------------- if not at top level, provide an uplink arrow  # -------------------------------- if not at top level, provide an uplink arrow
  if ($toplevel ne '/res/'){   if ($toplevel ne '/res/'){
Line 559  sub scanDir { Line 577  sub scanDir {
     my $c = $r->connection();      my $c = $r->connection();
     my ($compuri,$curdir);      my ($compuri,$curdir);
     my $dirptr=16384;      my $dirptr=16384;
       my $obs;
     $indent++;      $indent++;
   
     my %dupdirs = %dirs;      my %dupdirs = %dirs;
     my @list=&get_list($r,$startdir);      my @list=&get_list($r,$startdir);
     foreach my $line (@list) {      foreach my $line (@list) {
         return if ($c->aborted());          return if ($c->aborted());
  my ($strip,$dom,undef,$testdir,undef)=split(/\&/,$line,5);    #This is a kludge, sorry aboot this
  next if $strip =~ /.*\.meta$/;   my ($strip,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
    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 (scalar(@fileparts) >= 3) {      if (scalar(@fileparts) >= 3) {
  my $fext = pop @fileparts;   my $fext = pop @fileparts;
  my $ov = pop @fileparts;   my $ov = pop @fileparts;
Line 587  sub scanDir { Line 607  sub scanDir {
     $curdir = $startdir;      $curdir = $startdir;
  }   }
  my $diropen = 'closed';   my $diropen = 'closed';
  if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/)) {   if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/) or ($compuri=~/\.(sequence|page)\/$/)) {
     while (my ($key,$val)= each %dupdirs) {      while (my ($key,$val)= each %dupdirs) {
  if ($key eq $compuri and $val eq "open") {   if ($key eq $compuri and $val eq "open") {
     $diropen = "opened";      $diropen = "opened";
Line 605  sub scanDir { Line 625  sub scanDir {
 # --------------- get complete matched list based on the uri (returns an array)  # --------------- get complete matched list based on the uri (returns an array)
 sub get_list {  sub get_list {
     my ($r,$uri)=@_;      my ($r,$uri)=@_;
     my @list;      my @list=();
     (my $luri = $uri) =~ s/\//_/g;      (my $luri = $uri) =~ s/\//_/g;
     if ($ENV{'form.updatedisplay'}) {      if ($ENV{'form.updatedisplay'}) {
  foreach (keys %hash) {   foreach (keys %hash) {
Line 615  sub get_list { Line 635  sub get_list {
   
     if ($hash{'dirlist_files_'.$luri}) {      if ($hash{'dirlist_files_'.$luri}) {
  @list = split(/\n/,$hash{'dirlist_files_'.$luri});   @list = split(/\n/,$hash{'dirlist_files_'.$luri});
       } elsif ($uri=~/\.(page|sequence)\/$/) {
   # is a page or a sequence
    $uri=~s/\/$//;
    $uri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1];
    $uri=~s/\/+/\//g;
    foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri))) {
       my @ratpart=split(/\:/,$_);
       push @list,$ratpart[1];
    } 
    $hash{'dirlist_files_'.$luri} = join("\n",@list);
     } else {      } else {
   # is really a directory
  @list = &Apache::lonnet::dirlist($uri);   @list = &Apache::lonnet::dirlist($uri);
  $hash{'dirlist_files_'.$luri} = join("\n",@list);   $hash{'dirlist_files_'.$luri} = join("\n",@list);
     }      }
Line 661  sub match_ext { Line 692  sub match_ext {
  next if ($unpackline[0] eq '..');   next if ($unpackline[0] eq '..');
  my @filecom = split (/\./,$unpackline[0]);   my @filecom = split (/\./,$unpackline[0]);
  my $fext = pop(@filecom);   my $fext = pop(@filecom);
  my $fnptr = $unpackline[3]&$dirptr;   my $fnptr = ($unpackline[3]&$dirptr) || ($fext=~/\.(page|sequence)$/);
   if ($fnptr == 0 and $unpackline[3] ne "") {    if ($fnptr == 0 and $unpackline[3] ne "") {
     my $embstyle = &Apache::loncommon::fileembstyle($fext);      my $embstyle = &Apache::loncommon::fileembstyle($fext);
             push @trimlist,$line if (defined($embstyle) &&               push @trimlist,$line if (defined($embstyle) && 
Line 678  sub match_ext { Line 709  sub match_ext {
 sub display_line {  sub display_line {
     my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;      my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;
     my (@pathfn, $fndir);      my (@pathfn, $fndir);
   # there could be relative paths (files actually belonging into this directory)
   # or absolute paths (for example, from sequences)
       my $absolute;
       my $pathprefix;
       if ($line=~/^\/res\//) {
    $absolute=1;
    $pathprefix='';
       } else {
    $absolute=0;
    $pathprefix=$startdir;
       }
     my $dirptr=16384;      my $dirptr=16384;
     my $fileclr="#ffffe6";      my $fileclr="#ffffe6";
     my $iconpath= $r->dir_config('lonIconsURL') . '/';      my $iconpath= $r->dir_config('lonIconsURL') . '/';
Line 691  sub display_line { Line 733  sub display_line {
   
     my $tabtag='</td>';      my $tabtag='</td>';
     my $i=0;      my $i=0;
   
     while ($i<=8) {      while ($i<=8) {
  $tabtag=join('',$tabtag,"<td>&nbsp;</td>")   $tabtag=join('',$tabtag,"<td>&nbsp;</td>")
     if $hash{'display_attrs_'.$i} == 1;      if $hash{'display_attrs_'.$i} == 1;
Line 702  sub display_line { Line 743  sub display_line {
   
 # display uplink arrow  # display uplink arrow
     if ($filecom[1] eq 'viewOneUp') {      if ($filecom[1] eq 'viewOneUp') {
    my $updir=$startdir;
   # -------------- Filter out sequence containment in crumbs and "recent folders"
    $updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1];
    $updir=~s/\/+/\//g;
   
  $r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");   $r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");
  $r->print("<td>\n");   $r->print("<td>\n");
  $r->print ('<form method="post" name="dirpathUP" action="'.$startdir.   $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)" '.
Line 721  sub display_line { Line 767  sub display_line {
     }      }
 # Do we have permission to look at this?  # Do we have permission to look at this?
   
     return OK if (!&Apache::lonnet::allowed('bre',$startdir.$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='#aaaa88'; }
   
 # display domain  # display domain
     if ($filecom[1] eq 'domain') {      if ($filecom[1] eq 'domain') {
     $r->print ('<input type="hidden" name="dirPointer" value="on">'."\n")
        if ($ENV{'form.dirPointer'} eq "on");
  $r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");   $r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");
  $r->print("<td>");   $r->print("<td>");
  &begin_form ($r,$filecom[0]);   &begin_form ($r,$filecom[0]);
Line 775  sub display_line { Line 826  sub display_line {
     }      }
   
 # display file  # display file
     if ($fnptr == 0 and $filecom[3] ne '') {      if (($fnptr == 0 and $filecom[3] ne '') or $absolute) {
  my $filelink = $startdir.$filecom[0];   my $filelink = $pathprefix.$filecom[0];
  next if &Apache::lonnet::metadata($filelink,'obsolete');  
  my @file_ext = split (/\./,$listname);   my @file_ext = split (/\./,$listname);
  my $curfext = $file_ext[-1];   my $curfext = $file_ext[-1];
         if (@Omit) {          if (@Omit) {
Line 792  sub display_line { Line 842  sub display_line {
  my $iconname = &Apache::loncommon::icon($listname);   my $iconname = &Apache::loncommon::icon($listname);
  $r->print("<tr valign='$valign' bgcolor=$fileclr><td nowrap>");   $r->print("<tr valign='$valign' bgcolor=$fileclr><td nowrap>");
  my $metafile = grep /^\Q$filecom[0]\E\.meta\&/, @list;   my $metafile = grep /^\Q$filecom[0]\E\.meta\&/, @list;
   # my $metafile=1;
  my $title;   my $title;
         if ($ENV{'form.catalogmode'} eq 'interactive') {          if ($ENV{'form.catalogmode'} eq 'interactive') {
     $title=$listname;      $title=$listname;
     $title = &Apache::lonnet::metadata($filelink,'title')      $title = &Apache::lonnet::metadata($filelink,'title')
  if ($metafile == 1);   if ($metafile == 1);
     $title=$listname unless $title;      $title=$listname unless $title;
     my $titleesc=HTML::Entities::encode($title);      my $titleesc=HTML::Entities::encode($title,'<>&"');
     $titleesc=~s/\'/\\'/; #' (clean up this spare quote)      $titleesc=~s/\'/\\'/; #' (clean up this spare quote)
             $r->print("<a href=\"javascript:select_data(\'",              $r->print("<a href=\"javascript:select_data(\'",
                       $titleesc,"','",$filelink,"')\">");                        $titleesc,"','",$filelink,"')\">");
     $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".      $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".
       "\n");        "\n");
     $r->print("</td><td nowrap>");      $r->print("</td><td nowrap>");
  }   } elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
         elsif ($ENV{'form.catalogmode'} eq 'groupimport') {  
     $title=$listname;      $title=$listname;
     $title = &Apache::lonnet::metadata($filelink,'title')      $title = &Apache::lonnet::metadata($filelink,'title')
  if ($metafile == 1);   if ($metafile == 1);
     $title=$listname unless $title;   $title=$listname unless $title;
     my $titleesc=&HTML::Entities::encode($title);      my $titleesc=&HTML::Entities::encode($title,'<>&"');
     $r->print("<form name='form$fnum'>\n");      $r->print("<form name='form$fnum'>\n");
     $r->print("<input type='checkbox' name='filelink"."' ".      $r->print("<input type='checkbox' name='filelink"."' ".
       "value='$filelink' onClick='".        "value='$filelink' onClick='".
Line 828  sub display_line { Line 878  sub display_line {
     $hash{"pre_${fnum}_title"}=$titleesc;      $hash{"pre_${fnum}_title"}=$titleesc;
      $fnum++;       $fnum++;
  }   }
   # Form to open or close sequences
    if ($filelink=~/\.(page|sequence)$/) {
       my $curdir = $startdir.$filecom[0].'/';
       my $anchor = $curdir;
       $anchor =~ s/\///g;
       &begin_form($r,$curdir);
       $indent--;
    }
   # General indentation
  if ($indent > 0 and $indent < 11) {   if ($indent > 0 and $indent < 11) {
     $r->print("<img src=",$iconpath,"whitespace",$indent,      $r->print("<img src=",$iconpath,"whitespace",$indent,
       ".gif border='0' />\n");        ".gif border='0' />\n");
Line 844  sub display_line { Line 902  sub display_line {
     $r->print("<img src=",$iconpath,"whitespace",$rem,      $r->print("<img src=",$iconpath,"whitespace",$rem,
       ".gif border='0' />\n") if $rem > 0;        ".gif border='0' />\n") if $rem > 0;
  }   }
   # Sequence open/close icon
    if ($filelink=~/\.(page|sequence)$/) {
       my $curdir = $startdir.$filecom[0].'/';
       my $anchor = $curdir;
       $anchor =~ s/\///g;
       $r->print ('<input type="hidden" name="acts" value="">');
       $r->print ('<a name="'.$anchor.'"><input src="'.$iconpath.
          'folder_pointer_'.$diropen.'.gif"');
       $r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
          "\n");
    }
   # 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>');
    }
  $r->print (" <a href=\"javascript:openWindow('".$filelink.   $r->print (" <a href=\"javascript:openWindow('".$filelink.
    "', 'previewfile', '450', '500', 'no', 'yes','yes')\";".     "', 'previewfile', '450', '500', 'no', 'yes','yes')\";".
    " TARGET=_self>$listname</a> ");     " TARGET=_self>$listname</a> ");
Line 895  sub display_line { Line 968  sub display_line {
             my $output='';              my $output='';
             my $embstyle=&Apache::loncommon::fileembstyle($curfext);              my $embstyle=&Apache::loncommon::fileembstyle($curfext);
     if ($embstyle eq 'ssi') {      if ($embstyle eq 'ssi') {
        $output=&Apache::lonnet::ssi_body($filelink);   my $cache=$Apache::lonnet::perlvar{'lonDocRoot'}.$filelink.
                $output='<font size="-2">'.$output.'</font>';      '.tmp';
    if ((!$ENV{'form.updatedisplay'}) &&
       (-e $cache)) {
       open(FH,$cache);
       $output=join("\n",<FH>);
       close(FH);
    } else {
       $output=&Apache::lonnet::ssi_body($filelink);
       open(FH,">$cache");
       print FH $output;
       close(FH);
    }
    $output='<font size="-2">'.$output.'</font>';
    } elsif ($embstyle eq 'img') {     } elsif ($embstyle eq 'img') {
                $output='<img src="'.$filelink.'" />';                 $output='<img src="'.$filelink.'" />';
            } elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) {             } elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) {
Line 1009  sub begin_form { Line 1094  sub begin_form {
        '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.'">'.
        "\n");         "\n");
       $r->print ('<input type="hidden" name="dirPointer" value="on">'."\n");
     $dnum++;      $dnum++;
 }  }
   
Removed from v.1.87  
changed lines
  Added in v.1.103

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