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

Diff for /loncom/interface/portfolio.pm between versions 1.17 and 1.18

version 1.17, 2004/07/27 05:29:00 version 1.18, 2004/07/28 19:00:19
Line 63  sub displayDirectory { Line 63  sub displayDirectory {
     foreach my $line (@dirList) {      foreach my $line (@dirList) {
     #$strip holds directory/file name      #$strip holds directory/file name
     #$dom       #$dom 
     my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef,$path,$debug)=split(/\&/,$line,18);       my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
     $path =~ m:/:;  
     my $dirDepth = @-;  
         if (($fileName ne '.') && ($fileName ne '..')){          if (($fileName ne '.') && ($fileName ne '..')){
           for (my $i = 0; $i <= $dirDepth; $i += 1){  
            $displayOut.='<blockquote>';  
        }  
             if ($testdir =~ m:^1:){              if ($testdir =~ m:^1:){
                 # handle directories different from files                  # handle directories different from files
                 if ($fileName eq $currentFile){ #checks to bold the selected file                  if ($fileName eq $currentFile){ #checks to bold the selected file
                     $displayOut.= $debug.'<strong>'.(makeAnchor($fileName.'/', $path.$fileName.'/').'</strong><br />'."\n");                      $displayOut.= '<strong>'.(makeAnchor($fileName.'/', $fileName.'/').'</strong><br />'."\n");
                 }else{                  }else{
                     $displayOut.= $debug.(makeAnchor($fileName.'/', $path.$fileName.'/').'<br />'."\n");                      $displayOut.= (makeAnchor($fileName.'/', $fileName.'/').'<br />'."\n");
                 }                  }
             }else{              }else{
                 if ($fileName eq $currentFile){ #checks to bold the selected file                  if ($fileName eq $currentFile){ #checks to bold the selected file
                     $displayOut.=$debug.'<strong>'.(makeAnchor($fileName, $currentPath).'</strong><br />'."\n");                      $displayOut.='<strong>'.(makeAnchor($fileName, $currentPath).'</strong><br />'."\n");
                 }else{                  }else{
                     $displayOut.=$debug.(makeAnchor($fileName, $currentPath).'<br />'."\n");                      $displayOut.=(makeAnchor($fileName, $currentPath).'<br />'."\n");
                 }                  }
             }              }
         for (my $i = 0; $i <= $dirDepth; $i += 1){  
            $displayOut.='</blockquote>';  
        }  
                           
         }          }
         
Line 166  sub displayActions { Line 158  sub displayActions {
 sub handler {  sub handler {
     # this handles file management      # this handles file management
     my $r = shift;      my $r = shift;
       my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my @dirList; # will hold directory listing as array      my @dirList; # will hold directory listing as array
     my $udir; # returned from home server      my $udir; # returned from home server
     my $currentPath; # path assuming /userfiles/portfolio/ as root      my $currentPath; # path assuming /userfiles/portfolio/ as root
Line 174  sub handler { Line 167  sub handler {
     my $filenewname; # for rename action (guess what we do with it!)      my $filenewname; # for rename action (guess what we do with it!)
     my $isFile;      my $isFile;
     my $isEmpty;      my $isEmpty;
       my $dirptr=16384;
     &Apache::loncommon::no_cache($r);      &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
Line 221  sub handler { Line 215  sub handler {
         }          }
     }      }
     # we always need $dirList, plus this will return information about the current file      # we always need $dirList, plus this will return information about the current file
     # as well as information about he home server directory structure, specifically      # as well as information about the home server directory structure, specifically
     # the path to the users userfiles directory.          # the path to the users userfiles directory.    
     #       # 
     my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},      my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
      $ENV{'user.name'}).       $ENV{'user.name'}).
        '/userfiles/portfolio';         '/userfiles/portfolio'.$currentPath;
     my $done = 0;      @dirList = &Apache::lonnet::dirlist($currentPath,  $ENV{'user.domain'}, $ENV{'user.name'}, $portfolio_root);
     my $subdir = '';  
     my @workinglist; # intermediate array, holds directory listing lines (dirlist), and path information  
     my $readDirectory = 1; # flag for directory  
     my $loopCounter = 0; # needed only for development to prevent run away program (or maybe more?)  
     while (!$done){  
         # Needed while developing. Later, too?  
         $loopCounter += 1;  
         if ($loopCounter > 50) {  
             $r->print('<br />stop runaway');  
             return OK;  
         }  
         # ---  
         if ($readDirectory){ # is true the first time through, then true if dirlist line is a subdir  
             # $r->print('<br />reading '.$portfolio_root.$subdir);  
             my @list = &Apache::lonnet::dirlist($currentPath,  $ENV{'user.domain'}, $ENV{'user.name'}, $portfolio_root.$subdir);  
             $r->print('value in @list = '.@list);  
             for (my $i = 0; $i <= @list; $i++ ){  
                 my $line = pop @list;  
                 $line = $line.'&'.$subdir.'&'.$loopCounter; # append the subdirectory information and loopcounter for debug  
                 my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef,$subpath)=split(/\&/,$line,17);   
                 if (($fileName ne '.') && ($fileName ne '..')){ # we throw away the current and parent directories  
                     $r->print('<br />'.$line); #for debugging  
                     unshift @workinglist, $line; # add the line to the working list array  
                       
                 }else{  
                     $r->print('<br /> parent or current '.$line); #for debugging  
                 }  
             }  
         }  
         $r->print('<br />'.@workinglist.' lines in workinglist');  
         my $line = shift @workinglist; #take one off the working list  
         $r->print('<br />'.@workinglist.' lines in workinglist');  
         if ($line eq '') { # if the working list is empty  
             $done = 1;  
         }else{  
             my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef,$subpath,$debug)=split(/\&/,$line,18);   
             $r->print('<br />'.$fileName.' is '.$testdir);  
             push @dirList, $line; # and put it in the display list  
             if ($testdir =~ m:^1:) { # true if this is a directory  
                 # $r->print('<br />added subdir '.$fileName);  
                 $subdir = $subpath.'/'.$fileName;   
                 $readDirectory = 1;  
             }else{  
                 $readDirectory = 0;  
             }  
         }  
     }  
     # if item is directory {  get the next level down  
     # my @list = &Apache::lonnet::dirlist($currentPath,  $ENV{'user.domain'}, $ENV{'user.name'}, $portfolio_root.$);  
           
     if (@dirList == 2) { # need to know if directory is empty so it can be removed if desired      if (@dirList == 2) { # need to know if directory is empty so it can be removed if desired
         $isEmpty = 1;          $isEmpty = 1;
Line 305  sub handler { Line 250  sub handler {
     # Display begins here      # Display begins here
     #      #
     ##############################      ##############################
     $r->print('<table border=1><tr><td>');      $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
     $r->print(displayDirectory($currentPath, $currentFile, @dirList));              '<tr><th>&nbsp;</th><th>Actions</th><th>Name</th><th>Title</th><th>Status</th><th>Last Modified</th></tr>');
     $r->print('</td>><td>');      foreach my $line (@dirList) {
     $r->print(displayActions($currentPath, $currentFile, $isEmpty));      #$strip holds directory/file name
     $r->print('</td>></tr></table>');      #$dom 
       my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
           if ($dirptr&$testdir){
               $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td></tr>'); 
           }else{
               $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'doc.gif"></td></tr>');
           }
       }
   #   <tr bgcolor="#FFAA99"> pink bg 
   #   <tr bgcolor="#CCCCFF"> blue bg            
   #   $r->print(displayDirectory($currentPath, $currentFile, @dirList));
   #    $r->print('</td>><td>');
   #   $r->print(displayActions($currentPath, $currentFile, $isEmpty));
       $r->print('</table>');
     $r->print('</blockquote>');      $r->print('</blockquote>');
     $r->print("</body>\n</html>\n");      $r->print("</body>\n</html>\n");
     $r->rflush();      $r->rflush();
Removed from v.1.17  
changed lines
  Added in v.1.18

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