--- loncom/interface/portfolio.pm 2004/06/28 16:12:06 1.9 +++ loncom/interface/portfolio.pm 2004/08/24 04:55:49 1.22 @@ -18,12 +18,9 @@ # # /home/httpd/html/adm/gpl.txt # - - # http://www.lon-capa.org/ # - package Apache::portfolio; use strict; use Apache::Constants qw(:common :http); @@ -33,117 +30,135 @@ use Apache::lontexconvert; use Apache::lonfeedback; use Apache::lonlocal; -# receives a file name assumed to reside in username/userfiles/portfolio/ -# returns a form consisting of a single submit button labeled with the filename -sub makeAnchor { +# receives a file name and path stub from username/userfiles/portfolio/ +# returns an anchor tag consisting encoding filename and currentpath +sub makeAnchor{ my ($fileName, $currentPath) = @_; my $anchor = ''.$fileName.''; -# my $button = ' -#
-# '; return $anchor; } # returns html with'); - #grab stuff that was sent + &mt('Portfolio Manager'). + "\n". + &Apache::loncommon::bodytag('Portfolio Manager')); + $r->rflush(); &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['selectfile','currentpath', - 'currentfile']); - $r->print ('
CP= '.$ENV{'form.currentpath'}.'
'); + ['selectfile','currentpath', 'currentfile']); # currentPath and currentFile need to be set for the rest of things to happen # sometimes, currentFile will be passed by a form field, selectedfile # if there is no 'form.selectedfile' then the current directory is # considered as selected if ($ENV{'form.currentpath'}) { - $currentPath = $ENV{'form.currentpath'}; + $currentPath = $ENV{'form.currentpath'}; } else { - $currentPath = '/'; + $currentPath = '/'; } if ($ENV{'form.selectfile'}) { - $r->print('
found selectfile'.$ENV{'form.selectfile'} .'
'); - # have to check if the selected file is a subdirectory - if ($ENV{'form.selectfile'} =~ /-\(Dir\)/) { - # $currentPath =~ /\-\(Dir\)/; - $currentPath = $`.'/'; - $r->print('
'.$currentPath.'
'); - } - $currentFile = $ENV{'form.selectfile'}; + # have to check if the selected file is a subdirectory + if ($ENV{'form.selectfile'} =~ /-\(Dir\)/){ + # $currentPath =~ /\-\(Dir\)/; + $currentPath = $`.'/'; + $r->print('
'.$currentPath.'
'); + } + $currentFile = $ENV{'form.selectfile'}; } else { - $currentFile = ''; + $currentFile = ''; } # 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'}) { - $r->print($ENV{'form.storeupl'}.'
'); - $r->print(&Apache::lonnet::userfileupload('uploaddoc','','portfolio'.$currentPath).'
'); + $r->print($ENV{'form.storeupl'}.'
'); + $r->print(&Apache::lonnet::userfileupload('uploaddoc','','portfolio'.$currentPath).'
'); } # similarly, we need to delete or rename files before getting directory list - if ($ENV{'form.selectfile'}) { - if ($ENV{'form.fileaction'} eq 'delete') { - &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'delete', undef ); - $currentFile = ''; - } elsif($ENV{'form.fileaction'} eq 'rename') { - &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'rename', $ENV{'form.filenewname'} ); - # $r->print('We will rename your file'); - } + if ($ENV{'form.selectfile'}){ + if ($ENV{'form.fileaction'} eq 'delete') { + $r->print('
trying to delete '.$currentPath.$ENV{'form.selectfile'}.'
'); + $r->print(&Apache::lonnet::removeuserfile($ENV{'user.name'}, $ENV{'user.domain'},'portfolio'.$currentPath.$ENV{'form.selectfile'})); + $currentFile = ''; + } elsif ($ENV{'form.fileaction'} eq 'rename') { + &Apache::lonnet::portfoliomanage($currentPath.$ENV{'form.selectfile'}, 'rename', $currentPath.$ENV{'form.filenewname'} ); + } } # we always need $dirList, plus this will return information about the current file - # as well as information about he home server directory structure, specifically - # the path to the users userfiles directory. - @dirList = split /
/, (&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 + # as well as information about the home server directory structure, specifically + # the path to the users userfiles directory. + # + my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, + $ENV{'user.name'}). + '/userfiles/portfolio'; + @dirList = &Apache::lonnet::dirlist($currentPath, $ENV{'user.domain'}, $ENV{'user.name'}, $portfolio_root); - # $londcall added to help debug - my $londcall = pop(@dirList); - $r->print('
udir '.$londcall.'
'); - $udir = pop(@dirList); - $r->print('
path returned '.$udir.'
'); - $isFile = pop(@dirList); -# $r->print('
isfile '.$isFile.'
'); - $isDir = pop(@dirList); -# $r->print('
isdir '.$isDir.'
'); -# return OK if $r->header_only; - # Stuff to maintain proper setting for selected file - if ($ENV{'form.selectfile'}) { - if ($ENV{'form.fileaction'} eq 'delete') { - &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'delete', undef ); - $ENV{'portfolio.file'} = 'Selected File Deleted'; - } elsif($ENV{'form.fileaction'} eq 'rename') { - &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'rename', $ENV{'form.filenewname'} ); -# $r->print('We will rename your file'); - } else { - - # Remember user's file selection for later - $ENV{'portfolio.file'} = $ENV{'form.selectfile'}; - # offer things user can do with selected file - } + if (@dirList == 2) { # need to know if directory is empty so it can be removed if desired + $isEmpty = 1; } else { - unless ($ENV{'portfolio.file'}) { - $ENV{'portfolio.file'} = 'No File Selected'; - } + $isEmpty = 0; + } + + if ($ENV{'form.selectfile'}) { + if ($ENV{'form.fileaction'} eq 'delete') { + &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'delete', undef ); + $ENV{'portfolio.file'} = 'Selected File Deleted'; + } elsif ($ENV{'form.fileaction'} eq 'rename') { + &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'rename', $ENV{'form.filenewname'}); + } else { + # Remember user's file selection for later + $ENV{'portfolio.file'} = $ENV{'form.selectfile'}; + # offer things user can do with selected file + } + }else{ + unless ($ENV{'portfolio.file'}){ + $ENV{'portfolio.file'} = 'No File Selected'; + } } ############################## # # Display begins here # ############################## - $r->print('
start '); - $r->print($udir); - $r->print('
'); - $r->print(&displayDirectory($currentPath, $currentFile, $isDir, @dirList)); - $r->print(' '); - $r->print(&displayActions($currentPath, $currentFile, $isDir, $isFile)); + $r->print(' '); - $r->print('
'); + $r->print(' '); + my $displayOut = ''; + $r->print($displayOut); + $r->print(' '); + my $displayOut = ''; + $r->print($displayOut); $r->print('
end display
'); - $r->print(''); + my @tree = split (/\//,$currentPath); + $r->print(''.makeAnchor('/','/')); + if (@tree > 1){ + my $newCurrentPath = ''; + for (my $i = 1; $i< @tree; $i++){ + $newCurrentPath .= $tree[$i].'/'; + $r->print(makeAnchor($tree[$i],'/'.$newCurrentPath).'/'); + } + } + $r->print(''); + &Apache::lonhtmlcommon::store_recent('portfolio',$currentPath,$currentPath); + $r->print('
"); + $r->print(''. + '
'); + $r->print(''); + $r->print("'); + my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio/$currentPath/"; + foreach my $line (@dirList) { + #$strip holds directory/file name + #$dom + my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); + if (($fileName ne '.') && ($fileName ne '..')){ + if ($dirptr&$testdir){ + $r->print(' Actions Name Size Last Modified '); + }else{ + $r->print(' '); + $r->print(' Go to ... '); + $r->print(''.makeAnchor($fileName.'/',$currentPath.$fileName.'/').' '); + $r->print(''); + $r->print(' '); + } + } + } +#+ + + '); + $r->print(''); + $r->print(' '. + $fileName.' '); + $r->print(''.$size.' '); + $r->print(''.&Apache::lonlocal::locallocaltime($mtime).' '); + $r->print('pink bg +# blue bg +# $r->print(displayDirectory($currentPath, $currentFile, @dirList)); +# $r->print('> '); +# $r->print(displayActions($currentPath, $currentFile, $isEmpty)); + $r->print('