[LON-CAPA-cvs] cvs: loncom /interface portfolio.pm

banghart lon-capa-cvs@mail.lon-capa.org
Sat, 03 Jul 2004 00:35:01 -0000


banghart		Fri Jul  2 20:35:01 2004 EDT

  Modified files:              
    /loncom/interface	portfolio.pm 
  Log:
  
  	An effort at community style policing, plus removing lots of debugging
  	and early dead-ends.
  
  
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.10 loncom/interface/portfolio.pm:1.11
--- loncom/interface/portfolio.pm:1.10	Thu Jul  1 14:59:33 2004
+++ loncom/interface/portfolio.pm	Fri Jul  2 20:35:01 2004
@@ -172,42 +172,19 @@
     &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r, 'text/html');
     &Apache::loncommon::bodytag('Portfolio Managment', 'bgcolor="dogfood"');
-#
-#    $r->content_type('text/html');
     $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'},
                                             ['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
     # 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'}){
+    if ($ENV{'form.currentpath'}) {
         $currentPath = $ENV{'form.currentpath'};
-    }else{
+    } else {
         $currentPath = '/';
     }
-    if ($ENV{'form.selectfile'}){
-        $r->print('<br />found selectfile'.$ENV{'form.selectfile'} .'<br />');
+    if ($ENV{'form.selectfile'}) {
         # have to check if the selected file is a subdirectory
         if ($ENV{'form.selectfile'} =~ /-\(Dir\)/){
             # $currentPath =~ /\-\(Dir\)/;
@@ -215,68 +192,42 @@
             $r->print('<br />'.$currentPath.'<br />');
         }
         $currentFile = $ENV{'form.selectfile'};
-    }else{
+    } else {
         $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'}.'<br />');
-        $r->print (&Apache::lonnet::userfileupload('uploaddoc','','portfolio'.$currentPath).'<br />');  
+    if ($ENV{'form.uploaddoc.filename'}) {
+        $r->print($ENV{'form.storeupl'}.'<br />');
+        $r->print(&Apache::lonnet::userfileupload('uploaddoc','','portfolio'.$currentPath).'<br />');  
     }
     # similarly, we need to delete or rename files before getting directory list
     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(&Apache::lonnet::removeuserfile($ENV{'user.name'}, $ENV{'user.domain'},'portfolio'.$currentPath.$ENV{'form.selectfile'}));
             $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'} );
-            # $r->print ('We will rename your 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
     # 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);
 	@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
         $isEmpty = 1;
     }else{
         $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
-    if ($ENV{'form.selectfile'}){
-        if ($ENV{'form.fileaction'} eq 'delete'){
+    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{
-    
+        } 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
@@ -291,15 +242,12 @@
     # Display begins here
     #
     ##############################
-    $r->print ('<hr /> start ');
-    $r->print ($udir);
-    $r->print ('<table border=1><tr><td>');
-    $r->print (displayDirectory ($currentPath, $currentFile, $isDir, @dirList));
-    $r->print ('</td>><td>');
-    $r->print (displayActions ($currentPath, $currentFile, $isDir, $isEmpty));
-    $r->print ('</td>></tr></table>');
-    $r->print ('<br />end display<br /><hr />');
-    $r->print ('</blockquote></body>');
+    $r->print('<table border=1><tr><td>');
+    $r->print(displayDirectory($currentPath, $currentFile, $isDir, @dirList));
+    $r->print('</td>><td>');
+    $r->print(displayActions($currentPath, $currentFile, $isDir, $isEmpty));
+    $r->print('</td>></tr></table>');
+    $r->print('</blockquote></body>');
     return OK;
 }