[LON-CAPA-cvs] cvs: loncom /interface portfolio.pm
banghart
lon-capa-cvs@mail.lon-capa.org
Fri, 23 Jul 2004 01:25:56 -0000
banghart Thu Jul 22 21:25:56 2004 EDT
Modified files:
/loncom/interface portfolio.pm
Log:
Completely broken at this point, but approaching a better way of
seeing/managing directory contents.
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.15 loncom/interface/portfolio.pm:1.16
--- loncom/interface/portfolio.pm:1.15 Fri Jul 9 14:43:40 2004
+++ loncom/interface/portfolio.pm Thu Jul 22 21:25:56 2004
@@ -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);
@@ -32,17 +29,19 @@
use Apache::lontexconvert;
use Apache::lonfeedback;
use Apache::lonlocal;
+
+# receives a file name and path stub from username/userfiles/portfolio/
+# returns an anchor tag consisting encoding filename and currentpath
sub makeAnchor{
- # receives a file name and path stub from username/userfiles/portfolio/
- # returns an anchor tag consisting encoding filename and currentpath
my ($fileName, $currentPath) = @_;
my $anchor = '<a href="/adm/portfolio?selectfile='.$fileName.'¤tpath='.$currentPath.'">'.$fileName.'</a>';
return $anchor;
}
+
+# returns html with <br /> separated contents of the directory
+# returns a <strong>currentFile</strong> (bolds the selected file/dir)
sub displayDirectory {
- # returns html with <br /> separated contents of the directory
- # returns a <strong>currentFile</strong> (bolds the selected file/dir)
- my ($currentPath, $currentFile, $isDir, @dirList,) = @_;
+ my ($currentPath, $currentFile, @dirList,) = @_;
my $displayOut='';
my $fileName;
my $upPath;
@@ -64,22 +63,31 @@
foreach my $line (@dirList) {
#$strip holds directory/file name
#$dom
- my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);
+ my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef,$path)=split(/\&/,$line,17);
+ $path =~ m:/:;
+ my $dirDepth = @-;
if (($fileName ne '.') && ($fileName ne '..')){
+ for (my $i = 0; $i <= $dirDepth; $i += 1){
+ $displayOut.='<blockquote>';
+ }
if ($testdir =~ m:^1:){
# handle directories different from files
if ($fileName eq $currentFile){ #checks to bold the selected file
- $displayOut.= '<strong>'.(makeAnchor($fileName.'/', $currentPath.$fileName.'/').'</strong><br />');
+ $displayOut.= '<strong>'.(makeAnchor($fileName.'/', $path.$fileName.'/').'</strong><br />'."\n");
}else{
- $displayOut.= (makeAnchor($fileName.'/', $currentPath.$fileName.'/').'<br />');
+ $displayOut.= (makeAnchor($fileName.'/', $path.$fileName.'/').'<br />'."\n");
}
}else{
if ($fileName eq $currentFile){ #checks to bold the selected file
- $displayOut.='<strong>'.(makeAnchor($fileName, $currentPath).'</strong><br />');
+ $displayOut.='<strong>'.(makeAnchor($fileName, $currentPath).'</strong><br />'."\n");
}else{
- $displayOut.=(makeAnchor($fileName, $currentPath).'<br />');
+ $displayOut.=(makeAnchor($fileName, $currentPath).'<br />'."\n");
}
}
+ for (my $i = 0; $i <= $dirDepth; $i += 1){
+ $displayOut.='</blockquote>';
+ }
+
}
}
@@ -88,7 +96,7 @@
sub displayActions {
# returns html to offer user appropriate actions depending on selected file/directory
my $displayOut;
- my ($currentPath, $currentFile, $isDir, $isEmpty) = @_;
+ my ($currentPath, $currentFile, $isEmpty) = @_;
# $displayOut = 'here are actions for '.$currentFile;
if ($currentFile =~ m:/$:){
# if the selected file is a directory, these are the options
@@ -165,7 +173,6 @@
my $action; # delete, rename, makedirectory, removedirectory,
my $filenewname; # for rename action (guess what we do with it!)
my $isFile;
- my $isDir;
my $isEmpty;
&Apache::loncommon::no_cache($r);
&Apache::loncommon::content_type($r,'text/html');
@@ -216,17 +223,60 @@
# 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.
+ #
my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
$ENV{'user.name'}).
'/userfiles/portfolio';
- my @list = &Apache::lonnet::dirlist($currentPath, $ENV{'user.domain'}, $ENV{'user.name'}, $portfolio_root);
- @dirList = @list;
+ my $done = 0;
+ 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);
+ foreach my $line(@list){
+ $line = $line.'&'.$subdir; # append the subdirectory information
+ 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);
+ # should this be shift?
+ push @workinglist, $line; # add the line to the working list array
+ }
+ }
+ }
+ my $line = shift @workinglist; #take one off the working list
+ if ($line eq '') { # if the working list is empty
+ $done = 1;
+ }else{
+ push @dirList, $line; # and put it in the display list
+ my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef,$subpath)=split(/\&/,$line,17);
+ 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
$isEmpty = 1;
} else {
$isEmpty = 0;
}
- # 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 );
@@ -249,9 +299,9 @@
#
##############################
$r->print('<table border=1><tr><td>');
- $r->print(displayDirectory($currentPath, $currentFile, $isDir, @dirList));
+ $r->print(displayDirectory($currentPath, $currentFile, @dirList));
$r->print('</td>><td>');
- $r->print(displayActions($currentPath, $currentFile, $isDir, $isEmpty));
+ $r->print(displayActions($currentPath, $currentFile, $isEmpty));
$r->print('</td>></tr></table>');
$r->print('</blockquote>');
$r->print("</body>\n</html>\n");