--- loncom/interface/portfolio.pm	2005/04/07 06:56:23	1.82
+++ loncom/interface/portfolio.pm	2005/04/29 16:51:42	1.84
@@ -34,8 +34,9 @@ use Apache::lonnet;
 # receives a file name and path stub from username/userfiles/portfolio/
 # returns an anchor tag consisting encoding filename and currentpath
 sub make_anchor {
-    my ($filename, $current_path, $current_mode, $field_name) = @_;
-    my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'&currentpath='.$current_path.'&mode='.$current_mode.'&fieldname='.$field_name.'">'.$filename.'</a>';
+    my ($filename, $current_path, $current_mode, $field_name, $continue_select) = @_;
+    if ($continue_select ne 'true') {$continue_select = 'false'};
+    my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'&currentpath='.$current_path.'&mode='.$current_mode.'&continue='.$continue_select.'&fieldname='.$field_name.'">'.$filename.'</a>';
     return $anchor;
 }
 my $dirptr=16384;
@@ -65,12 +66,12 @@ sub display_common {
     $r->print($displayOut);
     $r->print('</td></tr></table>');
     my @tree = split (/\//,$current_path);
-    $r->print('<font size="+2">'.&make_anchor('portfolio','/',$env{"form.mode"},$env{"form.fieldname"}).'/');
+    $r->print('<font size="+2">'.&make_anchor('portfolio','/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"}).'/');
     if (@tree > 1){
         my $newCurrentPath = '';
         for (my $i = 1; $i< @tree; $i++){
             $newCurrentPath .= $tree[$i].'/';
-            $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}).'/');
+            $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"}).'/');
         }
     }
     $r->print('</font>');
@@ -124,7 +125,7 @@ sub display_directory {
     	#$dom 
     	my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
     	$filename =~ s/\s+$//;
-    	if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ )) {
+    	if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(.*)\.(.*)/)) {
             if ($dirptr&$testdir) {
                 if ($select_mode eq 'true'){
                     $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
@@ -132,12 +133,12 @@ sub display_directory {
                     $r->print('<tr bgcolor="#FFAA99"><td colspan="2"><img src="'.$iconpath.'folder_closed.gif"></td>');
                 }
                 $r->print('<td>Go to ...</td>');
-                $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"}).'</td>'); 
+                $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).'</td>'); 
                 $r->print('</tr>'); 
             } else {
                 $r->print('<tr bgcolor="#CCCCFF">');
                 if ($select_mode eq 'true'){
-                    $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'"'); 
+                    $r->print('<td><input type="checkbox" name="checkfile" value="'.$filename.'"'); 
                     if ($$checked_files{$filename} eq 'selected') {
                         $r->print("CHECKED");
                     }
@@ -351,13 +352,15 @@ sub select_files {
     if ($env{'form.continue'} eq 'true') {
         # here we update the selections for the currentpath
         # eventually, have to handle removing those not checked, but . . . 
-        my @items=&Apache::loncommon::get_env_multiple('form.selectfile');
-        &Apache::lonnet::save_selected_files($env{'user.name'}, $env{'form.currentpath'}, @items);
+        my @items=&Apache::loncommon::get_env_multiple('form.checkfile');
+        if (scalar(@items)){
+            &Apache::lonnet::logthis("one of the items is $items[0]");
+            &Apache::lonnet::save_selected_files($env{'user.name'}, $env{'form.currentpath'}, @items);
+        }
     } else {
-        if ($env{'form.currentpath'} eq '/') {
             #empty the file for a fresh start
-            # &Apache::lonnet::clear_selected_files($env{'user.name'});
-        }
+            &Apache::lonnet::logthis("Clearing saved files");
+            &Apache::lonnet::clear_selected_files($env{'user.name'});
     }
     my @files = &Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});
     my $java_files = join ",", @files;
@@ -446,7 +449,23 @@ sub upload {
 }
 sub lock_info {
     my ($r) = @_;
-    $r->print("lock info here");
+    my %current_permissions = &Apache::lonnet::dump('file_permissions',$env{'user.domain'},$env{'user.name'});
+    my $file_name = $env{'form.lockinfo'};
+    #my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($env{'user.domain'},$env{'user.name'});
+    foreach my $key (keys(%current_permissions)) {
+        if ($file_name eq $key) {
+        $r->print("$key = ");
+        foreach my $array_item (@{$current_permissions{$key}}) {
+            if (ref($array_item)) {
+            $r->print(&Apache::lonnet::gettitle($$array_item[0]).' is the problem<br>');
+            $r->print(&Apache::lonnet::coursedescription($$array_item[1]).' is the course<br>');
+            # $r->print('the third is '.$$array_item[2].'<br>');
+            # $r->print("item is $$array_item[0]<br> and $$array_item[0]");
+        }
+        }
+        }    
+    }
+    #$r->print("lock info here");
     return 'ok';
 }
 sub createdir {
@@ -497,7 +516,7 @@ sub handler {
 							'/userfiles/portfolio';
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['selectfile','currentpath','meta','lockinfo',
-					     'currentfile','action','fieldname','mode','rename']);
+					     'currentfile','action','fieldname','mode','rename','continue']);
     &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;