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

Diff for /loncom/interface/portfolio.pm between versions 1.10 and 1.11

version 1.10, 2004/07/01 18:59:33 version 1.11, 2004/07/03 00:35:01
Line 172  sub handler { Line 172  sub handler {
     &Apache::loncommon::no_cache($r);      &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r, 'text/html');      &Apache::loncommon::content_type($r, 'text/html');
     &Apache::loncommon::bodytag('Portfolio Managment', 'bgcolor="dogfood"');      &Apache::loncommon::bodytag('Portfolio Managment', 'bgcolor="dogfood"');
 #  
 #    $r->content_type('text/html');  
     $r->send_http_header;      $r->send_http_header;
 #    $r->print('<html><head><title>'.  
 #               'Portfolio Management'.  
 #               "</title></head>\n");  
 #   
     # FIXME need to start using  
 #    $r->print('  
 # <body bgcolor="dogfood">  
 # <blockquote>');  
   
 #    $r->content_type('text/html');  
 #    $r->send_http_header;  
 #    $r->print('<html><head><title>'.  
 #              'Portfolio Management'.  
 #              "</title></head>\n");  
 #  
 #    $r->print ('  
 #    <body bgcolor="dogfood">  
 #    <blockquote>');  
     #grab stuff that was sent  
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['selectfile','currentpath', 'currentfile']);                                              ['selectfile','currentpath', 'currentfile']);
 #   $r->print ('<br />CP= '.$ENV{'form.currentpath'}.'<br />');  
     # currentPath and currentFile need to be set for the rest of things to happen      # currentPath and currentFile need to be set for the rest of things to happen
     # sometimes, currentFile will be passed by a form field, selectedfile      # sometimes, currentFile will be passed by a form field, selectedfile
     # if there is no 'form.selectedfile' then the current directory is       # if there is no 'form.selectedfile' then the current directory is 
     # considered as selected       # considered as selected 
     if ($ENV{'form.currentpath'}){      if ($ENV{'form.currentpath'}) {
         $currentPath = $ENV{'form.currentpath'};          $currentPath = $ENV{'form.currentpath'};
     }else{      } else {
         $currentPath = '/';          $currentPath = '/';
     }      }
     if ($ENV{'form.selectfile'}){      if ($ENV{'form.selectfile'}) {
         $r->print('<br />found selectfile'.$ENV{'form.selectfile'} .'<br />');  
         # have to check if the selected file is a subdirectory          # have to check if the selected file is a subdirectory
         if ($ENV{'form.selectfile'} =~ /-\(Dir\)/){          if ($ENV{'form.selectfile'} =~ /-\(Dir\)/){
             # $currentPath =~ /\-\(Dir\)/;              # $currentPath =~ /\-\(Dir\)/;
Line 215  sub handler { Line 192  sub handler {
             $r->print('<br />'.$currentPath.'<br />');              $r->print('<br />'.$currentPath.'<br />');
         }          }
         $currentFile = $ENV{'form.selectfile'};          $currentFile = $ENV{'form.selectfile'};
     }else{      } else {
         $currentFile = '';          $currentFile = '';
     }      }
     # if we're uploading a file, we need to do it early so it will show in the directory list      # if we're uploading a file, we need to do it early so it will show in the directory list
     if ($ENV{'form.uploaddoc.filename'}){      if ($ENV{'form.uploaddoc.filename'}) {
         $r->print ($ENV{'form.storeupl'}.'<br />');          $r->print($ENV{'form.storeupl'}.'<br />');
         $r->print (&Apache::lonnet::userfileupload('uploaddoc','','portfolio'.$currentPath).'<br />');            $r->print(&Apache::lonnet::userfileupload('uploaddoc','','portfolio'.$currentPath).'<br />');  
     }      }
     # similarly, we need to delete or rename files before getting directory list      # similarly, we need to delete or rename files before getting directory list
     if ($ENV{'form.selectfile'}){      if ($ENV{'form.selectfile'}){
         if ($ENV{'form.fileaction'} eq 'delete'){          if ($ENV{'form.fileaction'} eq 'delete') {
             $r->print('<br />trying to delete '.$currentPath.$ENV{'form.selectfile'}.'<br />');              $r->print('<br />trying to delete '.$currentPath.$ENV{'form.selectfile'}.'<br />');
             $r->print(&Apache::lonnet::removeuserfile($ENV{'user.name'}, $ENV{'user.domain'},'portfolio'.$currentPath.$ENV{'form.selectfile'}));              $r->print(&Apache::lonnet::removeuserfile($ENV{'user.name'}, $ENV{'user.domain'},'portfolio'.$currentPath.$ENV{'form.selectfile'}));
             $currentFile = '';              $currentFile = '';
         }elsif($ENV{'form.fileaction'} eq 'rename')  {          } elsif ($ENV{'form.fileaction'} eq 'rename') {
             &Apache::lonnet::portfoliomanage($currentPath.$ENV{'form.selectfile'}, 'rename', $currentPath.$ENV{'form.filenewname'} );              &Apache::lonnet::portfoliomanage($currentPath.$ENV{'form.selectfile'}, 'rename', $currentPath.$ENV{'form.filenewname'} );
             # $r->print ('We will rename your file');  
         }          }
     }      }
     # 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 he home server directory structure, specifically
     # the path to the users userfiles directory.          # the path to the users userfiles directory.    
 #    $r->print('dir list follows<br />'.&Apache::lonnet::portfoliolist($currentPath, $currentFile).'<br />');  
  my $list = &Apache::lonnet::portfoliolist($currentPath, $currentFile);   my $list = &Apache::lonnet::portfoliolist($currentPath, $currentFile);
  @dirList = split(/:/,$list);   @dirList = split(/:/,$list);
 #    foreach my $line (@dirlist) {  
 #   
 #     #$strip holds directory/file name  
 #     #$dom   
 #     my ($strip,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);   
 #     $r->print ($strip.' '.$testdir.'<br />');  
 #    }  
 #    @dirList = split /<br\s\/>/, (&Apache::lonnet::portfoliolist($currentPath, $currentFile));  
       
     # portfoliolist returns isdir, isfile and udir as the final array elements  
     # we'll pop them off the bottom of the array, and put them where they belong  
       
     # $londcall added to help debug, contains the command sent to lond  
  #   my $londcall = pop @dirList;  
  #   $r->print ('<br />udir '.$londcall.'<br />');  
  #   $udir = pop @dirList;  
  #   $r->print ('<br />path returned '.$udir.'<br />');  
  #   $isFile = pop @dirList;  
 #   $r->print ('<br />isfile '.$isFile.'<br />');  
 #    $isDir = pop @dirList;  
     if (@dirList == 2){ # need to know if directory is empty to it can be removed if desired      if (@dirList == 2){ # need to know if directory is empty to it can be removed if desired
         $isEmpty = 1;          $isEmpty = 1;
     }else{      }else{
         $isEmpty = 0;          $isEmpty = 0;
     }      }
 #   $r->print ('<br />lines left ind dirlist '.@dirList.'<br />');  
 #   return OK if $r->header_only;  
     # Stuff to maintain proper setting for selected file      # Stuff to maintain proper setting for selected file
     if ($ENV{'form.selectfile'}){      if ($ENV{'form.selectfile'}) {
         if ($ENV{'form.fileaction'} eq 'delete'){          if ($ENV{'form.fileaction'} eq 'delete') {
             &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'delete', undef );              &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'delete', undef );
             $ENV{'portfolio.file'} = 'Selected File Deleted';              $ENV{'portfolio.file'} = 'Selected File Deleted';
         }elsif($ENV{'form.fileaction'} eq 'rename')  {          } elsif ($ENV{'form.fileaction'} eq 'rename') {
             &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'rename', $ENV{'form.filenewname'} );              &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'rename', $ENV{'form.filenewname'});
 #           $r->print ('We will rename your file');          } else {
         }else{  
       
         # Remember user's file selection for later          # Remember user's file selection for later
         $ENV{'portfolio.file'} = $ENV{'form.selectfile'};          $ENV{'portfolio.file'} = $ENV{'form.selectfile'};
         # offer things user can do with selected file          # offer things user can do with selected file
Line 291  sub handler { Line 242  sub handler {
     # Display begins here      # Display begins here
     #      #
     ##############################      ##############################
     $r->print ('<hr /> start ');      $r->print('<table border=1><tr><td>');
     $r->print ($udir);      $r->print(displayDirectory($currentPath, $currentFile, $isDir, @dirList));
     $r->print ('<table border=1><tr><td>');      $r->print('</td>><td>');
     $r->print (displayDirectory ($currentPath, $currentFile, $isDir, @dirList));      $r->print(displayActions($currentPath, $currentFile, $isDir, $isEmpty));
     $r->print ('</td>><td>');      $r->print('</td>></tr></table>');
     $r->print (displayActions ($currentPath, $currentFile, $isDir, $isEmpty));      $r->print('</blockquote></body>');
     $r->print ('</td>></tr></table>');  
     $r->print ('<br />end display<br /><hr />');  
     $r->print ('</blockquote></body>');  
     return OK;      return OK;
 }  }
   
Removed from v.1.10  
changed lines
  Added in v.1.11

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